X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=.gitlab-ci.yml;h=ee611fd3982234c84a430ca16b7057cb3314c9cf;hb=c2d6f61f26c60f1cd2c61c4e350d38015660c2fd;hp=3fa11e10aa75b7fb3afa6416a991be67b73ffd54;hpb=d60b8679a46212d992dcd94b9d3eeebfcff3f00a;p=mesa.git

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3fa11e10aa7..ee611fd3982 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,7 +14,7 @@
 # repository's registry will be used there as well.
 variables:
   UPSTREAM_REPO: mesa/mesa
-  DEBIAN_TAG: "2019-10-07_1"
+  DEBIAN_TAG: "2019-10-16"
   DEBIAN_ARM64_TAG: "arm64v8-2019-08-09"
   STRETCH_TAG: "2019-09-18"
   DEBIAN_VERSION: buster-slim
@@ -32,7 +32,7 @@ include:
   - local: '/.gitlab-ci/lava-gitlab-ci.yml'
 
 stages:
-  - containers
+  - container
   - build
   - test
 
@@ -59,17 +59,22 @@ stages:
 
 # Build the normal CI native and cross-build docker images.
 
+.container:
+  stage: container
+  extends:
+    - .ci-run-policy
+  variables:
+    # no need to pull the whole repo to build the container image
+    GIT_STRATEGY: none
+
 debian-10:
   extends:
     - .debian@container-ifnot-exists
-    - .ci-run-policy
-  stage: containers
+    - .container
   variables:
-    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
@@ -91,17 +96,16 @@ debian-9:
 test-container:arm64:
   extends:
     - .debian@container-ifnot-exists@arm64v8
-    - .ci-run-policy
-  stage: containers
+    - .container
   variables:
     DEBIAN_TAG: "$DEBIAN_ARM64_TAG"
-    GIT_STRATEGY: none # no need to pull the whole tree for rebuilding the image
     DEBIAN_EXEC: 'bash .gitlab-ci/debian-test-install.sh'
 
+
 # BUILD
 
 .build:
-  extends: .use-debian-10
+  extends: .ci-run-policy
   stage: build
   cache:
     key: ${CI_JOB_NAME}
@@ -135,12 +139,16 @@ test-container:arm64:
     - ccache --show-stats
 
 .meson-build:
-  extends: .build
+  extends:
+    - .build
+    - .use-debian-10
   script:
     - .gitlab-ci/meson-build.sh
 
 .scons-build:
-  extends: .build
+  extends:
+    - .build
+    - .use-debian-10
   variables:
     SCONSFLAGS: "-j4"
   script:
@@ -345,7 +353,7 @@ meson-i386:
       -D llvm=false
       -D osmesa=classic
 
-.meson-mingw32-x86_64:
+meson-mingw32-x86_64:
   extends: .meson-build
   variables:
     UNWIND: "false"
@@ -376,11 +384,17 @@ scons-old-llvm:
     - LLVM_VERSION=4.0 .gitlab-ci/scons-build.sh
     - LLVM_VERSION=5.0 .gitlab-ci/scons-build.sh
 
-.deqp-test:
-  extends: .use-debian-10
+.test:
+  extends: .ci-run-policy
   stage: test
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
+
+.deqp-test:
+  extends:
+    - .test
+    - .use-debian-10
+  variables:
     DEQP_SKIPS: deqp-default-skips.txt
   script:
     # Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY