gitlab CI: drop dependencies between jobs

None of our jobs rely on the artifacts of a previous job, so let's not
pass those around. Make this part of the default policy and include it
from every job.

Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>

2 files changed, 12 insertions, 4 deletions

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5eb7447..6c236b52 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -127,6 +127,7 @@ variables:
       - stuck_or_timeout_failure
   # cancel run when a newer version is pushed to the branch
   interruptible: true
+  dependencies: []
 
 .default_artifacts:
   artifacts:
@@ -318,13 +319,13 @@ alpine:latest@container-prep:
     - ci-fairy -v --authfile $AUTHFILE delete-image
             --repository $FDO_DISTRIBUTION_NAME/$FDO_DISTRIBUTION_VERSION
             --exclude-tag $FDO_DISTRIBUTION_TAG
-  dependencies: []
   allow_failure: true
   only:
     - schedules
 
 fedora:33@container-clean:
   extends:
+    - .policy
     - .container-clean
   variables:
     GIT_STRATEGY: none
@@ -334,6 +335,7 @@ fedora:33@container-clean:
 
 fedora:34@container-clean:
   extends:
+    - .policy
     - .container-clean
   variables:
     GIT_STRATEGY: none
@@ -343,6 +345,7 @@ fedora:34@container-clean:
 
 debian:stable@container-clean:
   extends:
+    - .policy
     - .container-clean
   variables:
     GIT_STRATEGY: none
@@ -352,6 +355,7 @@ debian:stable@container-clean:
 
 ubuntu:20.10@container-clean:
   extends:
+    - .policy
     - .container-clean
   variables:
     GIT_STRATEGY: none
@@ -361,6 +365,7 @@ ubuntu:20.10@container-clean:
 
 ubuntu:21.04@container-clean:
   extends:
+    - .policy
     - .container-clean
   variables:
     GIT_STRATEGY: none
@@ -370,6 +375,7 @@ ubuntu:21.04@container-clean:
 
 arch:rolling@container-clean:
   extends:
+    - .policy
     - .container-clean
   variables:
     GIT_STRATEGY: none
@@ -379,6 +385,7 @@ arch:rolling@container-clean:
 
 alpine:latest@container-clean:
   extends:
+    - .policy
     - .container-clean
   variables:
     GIT_STRATEGY: none
@@ -400,7 +407,6 @@ alpine:latest@container-clean:
   stage: build
   script:
     - .gitlab-ci/meson-build.sh
-  dependencies: []
 
 #
 # Fedora
@@ -1000,6 +1006,7 @@ freebsd:13.0@default-build:
 check-merge-request:
   extends:
     - .fdo.ci-fairy
+    - .policy
   stage: deploy
   script:
     - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml
diff --git a/.gitlab-ci/ci.template b/.gitlab-ci/ci.template
index 3e2dd164..c9051a19 100644
--- a/.gitlab-ci/ci.template
+++ b/.gitlab-ci/ci.template
@@ -108,6 +108,7 @@ variables:
       - stuck_or_timeout_failure
   # cancel run when a newer version is pushed to the branch
   interruptible: true
+  dependencies: []
 
 .default_artifacts:
   artifacts:
@@ -230,7 +231,6 @@ check-commit:
     - ci-fairy -v --authfile $AUTHFILE delete-image
             --repository $FDO_DISTRIBUTION_NAME/$FDO_DISTRIBUTION_VERSION
             --exclude-tag $FDO_DISTRIBUTION_TAG
-  dependencies: []
   allow_failure: true
   only:
     - schedules
@@ -240,6 +240,7 @@ check-commit:
 {% for version in distro.versions %}
 {{distro.name}}:{{version}}@container-clean:
   extends:
+    - .policy
     - .container-clean
   variables:
     GIT_STRATEGY: none
@@ -264,7 +265,6 @@ check-commit:
   stage: build
   script:
     - .gitlab-ci/meson-build.sh
-  dependencies: []
 
 #
 # Fedora
@@ -647,6 +647,7 @@ coverity:
 check-merge-request:
   extends:
     - .fdo.ci-fairy
+    - .policy
   stage: deploy
   script:
     - ci-fairy check-merge-request --require-allow-collaboration --junit-xml=results.xml