gitlab CI: make the container-clean dependent on container-prep

This is a test commit only to speed things up when testing the container-clean
phase. In the real instance, we don't want to remove our containers until the
test suite successfully completes on the new container.

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

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2047f560c914119ec9fa3130e6781f80640a6abd..26613c17906438c887f1da7709a4e3b36375a26f 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -413,60 +413,70 @@ fedora:30@container-clean:
   extends:
     - .fedora:30
     - .container-clean
+  needs: ["fedora:30@container-prep"]
 
 ### fedora 31
 fedora:31@container-clean:
   extends:
     - .fedora:31
     - .container-clean
+  needs: ["fedora:31@container-prep"]
 
 ### ubuntu 19.10
 ubuntu:19.10@container-clean:
   extends:
     - .ubuntu:19.10
     - .container-clean
+  needs: ["ubuntu:19.10@container-prep"]
 
 ### ubuntu 19.04
 ubuntu:19.04@container-clean:
   extends:
     - .ubuntu:19.04
     - .container-clean
+  needs: ["ubuntu:19.04@container-prep"]
 
 ### debian stable
 debian:stable@container-clean:
   extends:
     - .debian:stable
     - .container-clean
+  needs: ["debian:stable@container-prep"]
 
 ### debian sid
 debian:sid@container-clean:
   extends:
     - .debian:sid
     - .container-clean
+  needs: ["debian:sid@container-prep"]
 
 ### centos 7
 centos:7@container-clean:
   extends:
     - .centos:7
     - .container-clean
+  needs: ["centos:7@container-prep"]
 
 ### centos 8
 centos:8@container-clean:
   extends:
     - .centos:8
     - .container-clean
+  needs: ["centos:8@container-prep"]
 
 ### arch rolling
 arch:rolling@container-clean:
   extends:
     - .arch:rolling
     - .container-clean
+  needs: ["arch:rolling@container-prep"]
 
 ### alpine latest
 alpine:latest@container-clean:
   extends:
     - .alpine:latest
     - .container-clean
+  needs: ["alpine:latest@container-prep"]
 
 
 #################################################################

diff --git a/.gitlab-ci/gitlab-ci.tmpl b/.gitlab-ci/gitlab-ci.tmpl
index e1ceb91bb6398dcbb9c3f6a0773a7b58d0ba453f..028e1ba76d2dbe066e9d4c66b17cb787b9e2f60d 100644 (file)
--- a/.gitlab-ci/gitlab-ci.tmpl
+++ b/.gitlab-ci/gitlab-ci.tmpl
@@ -231,6 +231,7 @@ fedora:31@qemu-prep:
   extends:
     - .{{ distro.name }}:{{ version }}
     - .container-clean
+  needs: ["{{distro.name}}:{{version}}@container-prep"]
 
 {% endfor %}
 {% endfor %}