aboutsummaryrefslogtreecommitdiffstats
path: root/.gitlab-ci.yml
diff options
context:
space:
mode:
authorSamuel Pitoiset <[email protected]>2019-11-18 09:30:27 +0100
committerSamuel Pitoiset <[email protected]>2019-12-06 10:57:54 +0100
commit0b246d3558d6e82c83b5017166cbf8730ea0b5f1 (patch)
tree848d6dc4c13bd34ba309e815e29368c4a8ab04d7 /.gitlab-ci.yml
parent35a7ec79dbbbea313f587b49a8b67b097f244715 (diff)
gitlab-ci: add a new base test job for VK
Signed-off-by: Samuel Pitoiset <[email protected]> Reviewed-by: Michel Dänzer <[email protected]>
Diffstat (limited to '.gitlab-ci.yml')
-rw-r--r--.gitlab-ci.yml21
1 files changed, 18 insertions, 3 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 70a440cd5b6..581fb8c2ed2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -459,14 +459,12 @@ scons-old-llvm:
script:
- LLVM_VERSION=3.9 .gitlab-ci/scons-build.sh
-.test-gl:
+.test:
extends:
- .ci-run-policy
stage: test
variables:
GIT_STRATEGY: none # testing doesn't build anything from source
- TAG: *x86_test-gl
- image: "$CI_REGISTRY_IMAGE/debian/x86_test-gl:$TAG"
before_script:
# Note: Build dir (and thus install) may be dirty due to GIT_STRATEGY
- rm -rf install
@@ -479,10 +477,27 @@ scons-old-llvm:
- results/
dependencies:
- meson-testing
+
+.test-gl:
+ extends:
+ - .test
+ variables:
+ TAG: *x86_test-gl
+ image: "$CI_REGISTRY_IMAGE/debian/x86_test-gl:$TAG"
needs:
- meson-testing
- x86_test-gl
+.test-vk:
+ extends:
+ - .test
+ variables:
+ TAG: *x86_test-vk
+ image: "$CI_REGISTRY_IMAGE/debian/x86_test-vk:$TAG"
+ needs:
+ - meson-testing
+ - x86_test-vk
+
.piglit-test:
extends: .test-gl
artifacts: