gitlab-ci: add a new base test job for VK
authorSamuel Pitoiset <samuel.pitoiset@gmail.com>
Mon, 18 Nov 2019 08:30:27 +0000 (09:30 +0100)
committerSamuel Pitoiset <samuel.pitoiset@gmail.com>
Fri, 6 Dec 2019 09:57:54 +0000 (10:57 +0100)
Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>
.gitlab-ci.yml

index 70a440cd5b6c91de6bd2b2393ff55ffba0014e3e..581fb8c2ed2d663802da40d81fbb400a0bcbec2b 100644 (file)
@@ -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: