From: Michel Dänzer <mdaenzer@redhat.com>
Date: Thu, 10 Oct 2019 13:27:17 +0000 (+0200)
Subject: gitlab-ci: Add .use-debian-10 template
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=eb86cbabe64355fe728853b76824c803025a4ba7;p=mesa.git

gitlab-ci: Add .use-debian-10 template

It simplifies the definitions of jobs using the Debian 10 image.

The needs: was previously missing from the llvmpipe/softpipe test jobs,
so they could spuriously run if the debian-10 job failed or was
cancelled.

Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
---

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5e0dc3c635e..3b5fcebe857 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -68,6 +68,12 @@ debian-10:
     GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
     DEBIAN_EXEC: 'bash .gitlab-ci/debian-install.sh'
 
+.use-debian-10:
+  extends: .ci-run-policy
+  image: $DEBIAN_IMAGE
+  needs:
+    - debian-10
+
 debian-9:
   extends: debian-10
   variables:
@@ -95,10 +101,7 @@ test-container:arm64:
 # BUILD
 
 .build:
-  extends: .ci-run-policy
-  image: $DEBIAN_IMAGE
-  needs:
-    - debian-10
+  extends: .use-debian-10
   stage: build
   cache:
     key: ${CI_JOB_NAME}
@@ -374,9 +377,8 @@ scons-old-llvm:
     - LLVM_VERSION=5.0 .gitlab-ci/scons-build.sh
 
 .deqp-test:
-  extends: .ci-run-policy
+  extends: .use-debian-10
   stage: test
-  image: $DEBIAN_IMAGE
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
     DEQP_SKIPS: deqp-default-skips.txt