From: Andrew Bartlett <abartlet@samba.org>
Date: Mon, 19 Apr 2021 09:09:03 +0000 (+1200)
Subject: .gitlab-ci.yml: Return code coverage reporting for "none" tasks
X-Git-Tag: tevent-0.11.0~1013
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=836ad93795c5719622d69971d657fa57dca9f1b9;p=thirdparty%2Fsamba.git

.gitlab-ci.yml: Return code coverage reporting for "none" tasks

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>
---

diff --git a/.gitlab-ci-main.yml b/.gitlab-ci-main.yml
index f5271662915..757c6824b97 100644
--- a/.gitlab-ci-main.yml
+++ b/.gitlab-ci-main.yml
@@ -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: