diff options
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | .gitlab-ci/lava-gitlab-ci.yml | 5 |
2 files changed, 9 insertions, 6 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5d1fb4292fc..258430d4449 100644 --- 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 b994118fd6d..e505091d8c5 100644 --- 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 |