diff options
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 21 |
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: |