]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
.gitlab-ci.yml: Return code coverage reporting for "none" tasks
authorAndrew Bartlett <abartlet@samba.org>
Mon, 19 Apr 2021 09:09:03 +0000 (21:09 +1200)
committerAndrew Bartlett <abartlet@samba.org>
Wed, 28 Apr 2021 03:43:34 +0000 (03:43 +0000)
This was lost early on with 54f26cfcf2587a2b1d97f466a886fa89a116eea1
which did not take into account code coverage, which stopped running
for these tasks very early on with
71595201bea9b3fa28357065fa137806f9220f38.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Douglas Bagnall <douglas.bagnall@catalyst.net.nz>
.gitlab-ci-main.yml

index f52716629154c638e17c049153c1977189696e52..757c6824b9738cf7fad33b155017d2f88c3e6ce4 100644 (file)
@@ -433,6 +433,7 @@ pages:
     - samba-fips
     - samba-no-opath1
     - samba-no-opath2
+    - ubuntu1804-samba-o3
   script:
     - ls -la *.info
     - ./configure.developer
@@ -486,6 +487,15 @@ coverity:
 # We build samba-o3 on all supported distributions
 #
 
+# This job, which matches the main CI, needs to still do coverage so
+# we show the coverage on the "none" environment tests
+ubuntu1804-samba-o3:
+  extends: .shared_template
+  variables:
+    AUTOBUILD_JOB_NAME: samba-o3
+    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu1804}
+
+# All other jobs do not want code coverage.
 .samba-o3-template:
   extends: .shared_template
   variables:
@@ -495,11 +505,6 @@ coverity:
       # do not run o3 for coverage since they are using different images
       - $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE == ""
 
-ubuntu1804-samba-o3:
-  extends: .samba-o3-template
-  variables:
-    SAMBA_CI_JOB_IMAGE: ${SAMBA_CI_CONTAINER_IMAGE_ubuntu1804}
-
 ubuntu2004-samba-o3:
   extends: .samba-o3-template
   variables: