ci: Output more information

Show the number of detected CPUs (and the detection
source).

Show the current OS.

Author: ChristianTackeGSI

FairRoot_build_test.cmake

@@ -14,19 +14,8 @@ fairroot_ctest_setup()
 set(CTEST_CUSTOM_MAXIMUM_PASSED_TEST_OUTPUT_SIZE 102400)
 set(CTEST_CONFIGURATION_TYPE "RelWithDebInfo")
 
-if(NOT NCPUS)
-  if(DEFINED ENV{SLURM_CPUS_PER_TASK})
-    set(NCPUS $ENV{SLURM_CPUS_PER_TASK})
-  elseif(DEFINED ENV{SLURM_JOB_CPUS_PER_NODE})
-    set(NCPUS $ENV{SLURM_JOB_CPUS_PER_NODE})
-  else()
-    include(ProcessorCount)
-    ProcessorCount(NCPUS)
-    if(NCPUS EQUAL 0)
-      set(NCPUS 1)
-    endif()
-  endif()
-endif()
+get_NCPUS()
+get_os_name_release()
 
 if ("$ENV{LABEL}" STREQUAL "")
   set(CTEST_BUILD_NAME "build")

cmake/private/Testlib.cmake

@@ -1,5 +1,5 @@
 ################################################################################
-# Copyright (C) 2020-2022 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
+# Copyright (C) 2020-2023 GSI Helmholtzzentrum fuer Schwerionenforschung GmbH  #
 #                                                                              #
 #              This software is distributed under the terms of the             #
 #              GNU Lesser General Public Licence (LGPL) version 3,             #
@@ -22,6 +22,51 @@ macro(fairroot_ctest_setup)
   endif()
 endmacro()
 
+macro(get_NCPUS)
+  if(NOT NCPUS)
+    if(DEFINED ENV{SLURM_CPUS_PER_TASK})
+      set(NCPUS $ENV{SLURM_CPUS_PER_TASK})
+      set(NCPUS_SOURCE "SLURM_CPUS_PER_TASK")
+    elseif(DEFINED ENV{SLURM_JOB_CPUS_PER_NODE})
+      set(NCPUS $ENV{SLURM_JOB_CPUS_PER_NODE})
+      set(NCPUS_SOURCE "SLURM_JOB_CPUS_PER_NODE")
+    else()
+      include(ProcessorCount)
+      ProcessorCount(NCPUS)
+      if(NCPUS EQUAL 0)
+        set(NCPUS 1)
+      endif()
+      set(NCPUS_SOURCE "ProcessorCount()")
+    endif()
+  else()
+    set(NCPUS_SOURCE "Already-Set")
+  endif()
+  message(STATUS " NCPUS ................: ${NCPUS} (from ${NCPUS_SOURCE})")
+endmacro()
+
+macro(get_os_name_release)
+  find_program(LSB_RELEASE_EXEC lsb_release)
+  if(NOT LSB_RELEASE_EXEC)
+    # message(WARNING "lsb_release not found")
+    cmake_host_system_information(RESULT os_name QUERY OS_NAME)
+    cmake_host_system_information(RESULT os_release QUERY OS_RELEASE)
+  else()
+    execute_process(COMMAND ${LSB_RELEASE_EXEC} -si
+      OUTPUT_VARIABLE os_name
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND ${LSB_RELEASE_EXEC} -sr
+      OUTPUT_VARIABLE os_release
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process(COMMAND ${LSB_RELEASE_EXEC} -sd
+      OUTPUT_VARIABLE os_description
+      OUTPUT_STRIP_TRAILING_WHITESPACE)
+  endif()
+  if(NOT os_description)
+    set(os_description "${os_name}-${os_release}")
+  endif()
+  message(STATUS " OS Description .......: ${os_description}")
+endmacro()
+
 macro(show_jenkins_info)
     if(DEFINED ENV{CHANGE_URL})
         message(STATUS " Pull / Merge Request .: $ENV{CHANGE_URL}")