gitlab-ci: set a common job parent for test stage

Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Michel Dänzer <mdaenzer@redhat.com>

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 5d1fb4292fc74458f5d082fa3bbc2753c412c840..258430d4449559677adfb0bf72c02e345b0762fd 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -384,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

diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index b994118fd6d5abfed938e429fa818b200aa03d9a..e505091d8c504862892603b3a552fe113fbe9646 100644 (file)
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -147,11 +147,8 @@ lava-build:arm64:
     KERNEL_IMAGE_NAME: "Image"
 
 .lava-test:
-  stage: test
   extends:
-    - .ci-run-policy
-  variables:
-    GIT_STRATEGY: none # no need to pull the whole tree for submitting the job
+    - .test
   script:
     - lava_job_id=`lavacli jobs submit $CI_PROJECT_DIR/results/lava-deqp-$DEVICE_TYPE.yml`
     - echo $lava_job_id