Merge topic 'cdash_updates'

e51e333f gitlab-ci: always provide artifacts
8afd70b7 Add cdash annotations
4b35be9d Update cdash groups

Acked-by: Kitware Robot <kwrobot@kitware.com>
Tested-by: buildbot <buildbot@kitware.com>
Reviewed-by: Ben Boeckel <ben.boeckel@kitware.com>
Merge-request: !153

.gitlab-ci.yml

@@ -45,6 +45,7 @@ fedora33:test:
     extends:
         - .fedora33_plain
         - .cmake_test_linux
+        - .cmake_annotation_artifacts
         - .linux_test_tags
         - .run_dependent
     needs:
@@ -64,6 +65,7 @@ fedora33-asan:test:
     extends:
         - .fedora33_asan
         - .cmake_memcheck_linux
+        - .cmake_annotation_artifacts
         - .linux_test_priv_tags
         - .run_dependent
     needs:
@@ -81,6 +83,7 @@ fedora33-ubsan:test:
     extends:
         - .fedora33_ubsan
         - .cmake_memcheck_linux
+        - .cmake_annotation_artifacts
         - .linux_test_tags
         - .run_dependent
     needs:
@@ -90,6 +93,7 @@ fedora33-tidy:build:
     extends:
         - .fedora33_tidy
         - .cmake_build_linux
+        - .cmake_annotation_artifacts
         - .linux_builder_tags
         - .run_automatically
     timeout: 1h 30m
@@ -116,6 +120,7 @@ fedora33-coverage:analyze:
     extends:
         - .fedora33_coverage
         - .cmake_coverage_linux
+        - .cmake_annotation_artifacts
         - .linux_builder_tags
         - .run_dependent
     needs:
@@ -137,6 +142,7 @@ macos:test:
     extends:
         - .macos_plain
         - .cmake_test_macos
+        - .cmake_annotation_artifacts
         - .macos_x86_64_builder_tags
         - .run_dependent
     needs:
@@ -158,6 +164,7 @@ windows-vs2022-ninja:test:
     extends:
         - .windows_vs2022_ninja
         - .cmake_test_windows
+        - .cmake_annotation_artifacts
         - .windows_builder_tags
         - .run_dependent
     needs:

.gitlab/artifacts.yml

 # Lists of paths for artifacts of various stages.
 
+.cmake_annotation_artifacts:
+    artifacts:
+        expire_in: 1d
+        when: always
+        reports:
+            annotations:
+                - build/annotations.json
+
 .cmake_build_artifacts:
     artifacts:
         expire_in: 1d
+        when: always
+        reports:
+            annotations:
+                - build/annotations.json
         paths:
             # The artifacts of the build.
             - build/bin/
@@ -23,10 +35,12 @@
 
             # CDash files.
             - build/DartConfiguration.tcl
+            - build/cdash-build-id
 
 .cmake_coverage_artifacts:
     artifacts:
         expire_in: 1d
+        when: always
         paths:
             # CTest files.
             - build/CTestCustom*.cmake
@@ -42,3 +56,4 @@
 
             # CDash files.
             - build/DartConfiguration.tcl
+            - build/cdash-build-id

.gitlab/ci/cdash-groups.json

 {
     "latest-aeva-session": [
-        { "group": "aeva-session-master", "site": "gitlab-ci", "buildname": "fedora33_asan" },
-        { "group": "aeva-session-master", "site": "gitlab-ci", "buildname": "fedora33_coverage" },
-        { "group": "aeva-session-master", "site": "gitlab-ci", "buildname": "fedora33_plain" },
-        { "group": "aeva-session-master", "site": "gitlab-ci", "buildname": "fedora33_tidy" },
-        { "group": "aeva-session-master", "site": "gitlab-ci", "buildname": "fedora33_ubsan" },
-        { "group": "aeva-session-master", "site": "gitlab-ci", "buildname": "macos_plain" },
-        { "group": "aeva-session-master", "site": "gitlab-ci", "buildname": "windows_vs2022_ninja" }
+        { "group": "aeva-session-master", "site": "gitlab-ci", "buildname": "session-fedora33_asan" },
+        { "group": "aeva-session-master", "site": "gitlab-ci", "buildname": "session-fedora33_coverage" },
+        { "group": "aeva-session-master", "site": "gitlab-ci", "buildname": "session-fedora33_plain" },
+        { "group": "aeva-session-master", "site": "gitlab-ci", "buildname": "session-fedora33_tidy" },
+        { "group": "aeva-session-master", "site": "gitlab-ci", "buildname": "session-fedora33_ubsan" },
+        { "group": "aeva-session-master", "site": "gitlab-ci", "buildname": "session-macos_plain" },
+        { "group": "aeva-session-master", "site": "gitlab-ci", "buildname": "session-windows_vs2022_ninja" }
     ]
 }

.gitlab/ci/ctest_annotation.cmake

+function (ctest_annotation_report file)
+  set(label "")
+
+  if (EXISTS "${file}")
+    file(READ "${file}" json)
+  else ()
+    set(json "{\"CDash\": []}")
+  endif ()
+
+  foreach (arg IN LISTS ARGN)
+    if (NOT label)
+      set(label "${arg}")
+      continue ()
+    endif ()
+
+    set(item "{\"external_link\":{\"label\":\"${label}\",\"url\":\"${arg}\"}}")
+    set(label "")
+
+    string(JSON length LENGTH "${json}" "CDash")
+    string(JSON json SET "${json}" "CDash" "${length}" "${item}")
+  endforeach ()
+
+  file(WRITE "${file}" "${json}")
+endfunction ()
+
+if (NOT DEFINED build_id)
+  include("${CTEST_BINARY_DIRECTORY}/cdash-build-id" OPTIONAL)
+endif ()
+
+function (store_build_id build_id)
+  file(WRITE "${CTEST_BINARY_DIRECTORY}/cdash-build-id"
+    "set(build_id \"${build_id}\")\n")
+endfunction ()

.gitlab/ci/ctest_build.cmake

@@ -16,9 +16,18 @@ endif ()
 
 ctest_build(
   NUMBER_WARNINGS num_warnings
+  NUMBER_ERRORS num_errors
   RETURN_VALUE build_result)
 ctest_submit(PARTS Build)
 
+include("${CMAKE_CURRENT_LIST_DIR}/ctest_annotation.cmake")
+if (DEFINED build_id)
+  ctest_annotation_report("${CTEST_BINARY_DIRECTORY}/annotations.json"
+    "Build Errors (${num_errors})" "https://open.cdash.org/viewBuildError.php?buildid=${build_id}"
+    "Build Warnings (${num_warnings})" "https://open.cdash.org/viewBuildError.php?type=1&buildid=${build_id}"
+  )
+endif ()
+
 if (build_result)
   message(FATAL_ERROR
     "Failed to build")

.gitlab/ci/ctest_configure.cmake

@@ -24,7 +24,19 @@ ctest_read_custom_files("${CTEST_BINARY_DIRECTORY}")
 
 # We can now submit because we've configured. This is a cmb-superbuild-ism.
 ctest_submit(PARTS Update)
-ctest_submit(PARTS Configure)
+ctest_submit(
+  PARTS Configure
+  BUILD_ID build_id)
+
+include("${CMAKE_CURRENT_LIST_DIR}/ctest_annotation.cmake")
+if (DEFINED build_id)
+  ctest_annotation_report("${CTEST_BINARY_DIRECTORY}/annotations.json"
+    "Build Summary" "https://open.cdash.org/build/${build_id}"
+    "Update" "https://open.cdash.org/build/${build_id}/update"
+    "Configure" "https://open.cdash.org/build/${build_id}/configure"
+  )
+  store_build_id("${build_id}")
+endif ()
 
 if (configure_result)
   message(FATAL_ERROR

.gitlab/ci/ctest_memcheck.cmake

@@ -23,6 +23,13 @@ ctest_memcheck(
 ctest_submit(PARTS Test)
 ctest_submit(PARTS Memcheck)
 
+include("${CMAKE_CURRENT_LIST_DIR}/ctest_annotation.cmake")
+if (DEFINED build_id)
+  ctest_annotation_report("${CTEST_BINARY_DIRECTORY}/annotations.json"
+    "Defects (${defects})" "https://open.cdash.org/viewDynamicAnalysis.php?buildid=${build_id}"
+  )
+endif ()
+
 if (test_result)
   message(FATAL_ERROR
     "Failed to test")

.gitlab/ci/ctest_test.cmake

@@ -18,6 +18,17 @@ ctest_test(
   EXCLUDE "${test_exclusions}")
 ctest_submit(PARTS Test)
 
+include("${CMAKE_CURRENT_LIST_DIR}/ctest_annotation.cmake")
+if (DEFINED build_id)
+  ctest_annotation_report("${CTEST_BINARY_DIRECTORY}/annotations.json"
+    "Build Summary" "https://open.cdash.org/build/${build_id}"
+    "All Tests"     "https://open.cdash.org/viewTest.php?buildid=${build_id}"
+    "Test Failures" "https://open.cdash.org/viewTest.php?onlyfailed&buildid=${build_id}"
+    "Tests Not Run" "https://open.cdash.org/viewTest.php?onlynotrun&buildid=${build_id}"
+    "Test Passes"   "https://open.cdash.org/viewTest.php?onlypassed&buildid=${build_id}"
+  )
+endif ()
+
 if (test_result)
   message(FATAL_ERROR
     "Failed to test")