diff options
| author | Michel Dänzer <mdaenzer@redhat.com> | 2019-09-18 16:17:01 +0200 |
|---|---|---|
| committer | Michel Dänzer <michel@daenzer.net> | 2019-09-30 09:17:00 +0200 |
| commit | 88319f267825e9799b48ce3ef97bfc4b186e0fe3 (patch) | |
| tree | 5754c4b1ac369b401d53ab9f3e0a17b7b090b972 /.gitlab-ci.yml | |
| parent | ffb0d3a25c60dd7fc5cb1f2c33c2977b245b5fee (diff) | |
| download | mesa-88319f267825e9799b48ce3ef97bfc4b186e0fe3.tar.gz | |
gitlab-ci: Declare needs: for stretch docker image
This allows the *-old-llvm jobs to run before the buster docker images
are ready.
v2:
* Use - list syntax instead of [] (Eric Engestrom)
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 20f216d001c..7506129b924 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -73,6 +73,11 @@ debian-9: DEBIAN_IMAGE: $STRETCH_IMAGE DEBIAN_EXEC: 'bash .gitlab-ci/debian-stretch-install.sh' +.use-debian-9: + image: $STRETCH_IMAGE + needs: + - debian-9 + # Builds a Docker image with the native environment and VK-GL-CTS for testing. test-container:arm64: extends: @@ -277,8 +282,9 @@ meson-clover: - LLVM_VERSION=7 .gitlab-ci/meson-build.sh meson-clover-old-llvm: - extends: meson-clover - image: $STRETCH_IMAGE + extends: + - meson-clover + - .use-debian-9 variables: UNWIND: "false" DRI_LOADERS: > @@ -343,8 +349,9 @@ scons: - LLVM_VERSION=8 .gitlab-ci/scons-build.sh scons-old-llvm: - extends: scons - image: $STRETCH_IMAGE + extends: + - scons + - .use-debian-9 script: - LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh - LLVM_VERSION=4.0 .gitlab-ci/scons-build.sh |