.gitlab-ci.yml: Align tasks with "pages" dependency to get comprehensive code coverage

These two lists can get out of skew very easily.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
Reviewed-by: Gary Lockyer <gary@samba.org>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 515fb117902503d5b25566b2cf4ecdc786bac70c..36fe28359b4e6c9a3901814096cbe856c05e85f1 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -99,6 +99,10 @@ include:
     - echo "Running cmd script/autobuild.py $AUTOBUILD_JOB_NAME $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase"
     - script/autobuild.py $AUTOBUILD_JOB_NAME $SAMBA_CI_AUTOBUILD_ENABLE_COVERAGE  --verbose --nocleanup --keeplogs --tail --testbase /tmp/samba-testbase
 
+# Ensure when adding a new job below that you also add it to
+# the dependencies for 'pages' below for the code coverage page
+# generation.
+
 others:
   extends: .shared_template
   script:
@@ -211,31 +215,34 @@ pages:
     - docker
     - shared
   dependencies:  # tell gitlab to download artifacts for these jobs
+    - others
     - samba
-    - samba-ad-dc-1
-    - samba-ad-dc-1-mitkrb5
+    - samba-mitkrb5
+    - samba-none-env
+    - samba-nopython
+    - samba-nopython-py2
+    - samba-xc
+    - samba-admem
     - samba-ad-dc-2
     - samba-ad-dc-3
     - samba-ad-dc-4
-    - samba-ad-dc-4-mitkrb5
     - samba-ad-dc-5
     - samba-ad-dc-6
-    - samba-ad-dc-backup
+    - samba-libs
+    - samba-static
+    # - ctdb  # TODO
+    - samba-ctdb
     - samba-ad-dc-ntvfs
-    - samba-admem
     - samba-admem-mit
-    - samba-ctdb
+    - samba-ad-dc-4-mitkrb5
+    - samba-ad-dc-backup
+    - samba-simpleserver
     - samba-fileserver
-    - samba-libs
-    - samba-none-env
-    - samba-nopython
-    - samba-nopython-py2
+    - samba-ktest-heimdal
+    - samba-ad-dc-1
     - samba-nt4
     - samba-schemaupgrade
-    - samba-static
-    - samba-xc
-    # - ctdb  # TODO
-    - others
+    - samba-ad-dc-1-mitkrb5
   script:
     - ./configure.developer
     - make -j