Enable unit test artifacts for gcov jobs

Without using the build artifacts from the unit test jobs in the
bookworm tests, the gcov would be incomplete.

(cherry picked from commit e5636598a5fd795ef80421f3a5d48c511a9498ff)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 27c7e287c34e151085e1fc6789b558c7d956e5df..00606426458fd756558c2f665447748ad6d50298 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -53,6 +53,9 @@ variables:
 
   HYPOTHESIS_PROFILE: "ci"
 
+  # Some jobs may clean up the build artifacts unless this is set to 0.
+  CLEAN_BUILD_ARTIFACTS_ON_SUCCESS: 1
+
 default:
   # Allow all running CI jobs to be automatically canceled when a new
   # version of a branch is pushed.
@@ -374,7 +377,7 @@ stages:
     - >
       "$PYTEST" --junit-xml="$CI_PROJECT_DIR"/junit.xml -n "$TEST_PARALLEL_JOBS" | tee pytest.out.txt
     - '( ! grep -F "grep: warning:" pytest.out.txt )'
-    - make clean >/dev/null 2>&1
+    - test "$CLEAN_BUILD_ARTIFACTS_ON_SUCCESS" -eq 0 || ( cd ../../.. && make clean >/dev/null 2>&1 )
   after_script:
     - test -n "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}"
     - *display_pytest_failures
@@ -429,7 +432,7 @@ stages:
     - test -n "${OUT_OF_TREE_WORKSPACE}" && cd "${OUT_OF_TREE_WORKSPACE}"
   script:
     - make -j${TEST_PARALLEL_JOBS:-1} -k unit V=1
-    - make clean >/dev/null 2>&1
+    - test "$CLEAN_BUILD_ARTIFACTS_ON_SUCCESS" -eq 0 || make clean >/dev/null 2>&1
   after_script:
     - test -d bind-* && cd bind-*
     - REALSOURCEDIR="$PWD"
@@ -933,8 +936,9 @@ system:gcc:bookworm:amd64:
   <<: *system_test_gcov_job
   variables:
     CI_ENABLE_ALL_TESTS: 1
+    CLEAN_BUILD_ARTIFACTS_ON_SUCCESS: 0
     TZ: Australia/Sydney
-  needs:
+  needs:  # using artifacts from unit test job is required for gcov
     - job: unit:gcc:bookworm:amd64
       artifacts: true
 
@@ -943,6 +947,7 @@ unit:gcc:bookworm:amd64:
   <<: *unit_test_gcov_job
   variables:
     CI_ENABLE_ALL_TESTS: 1
+    CLEAN_BUILD_ARTIFACTS_ON_SUCCESS: 0
   needs:
     - job: gcc:bookworm:amd64
       artifacts: true
@@ -961,7 +966,7 @@ system:gcc:bookworm:rbt:amd64:
   <<: *debian_bookworm_amd64_image
   <<: *system_test_job
   needs:
-    - job: unit:gcc:bookworm:rbt:amd64
+    - job: gcc:bookworm:rbt:amd64
       artifacts: true
 
 unit:gcc:bookworm:rbt:amd64: