From d62dd8b0cb7f74ec43fac6f59c42178f4cf08c54 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Fri, 13 Dec 2019 10:20:23 +0100 Subject: gitlab-ci: Switch LAVA jobs to use shared dEQP runner Take one step towards sharing code between the LAVA and non-LAVA jobs, with the goals of reducing maintenance burden and use of computational resources. The env var DEQP_NO_SAVE_RESULTS allows us to skip the procesing of the XML result files, which can take a long time and is not useful in the LAVA case as we are not uploading artifacts anywhere at the moment. Signed-off-by: Tomeu Vizoso Reviewed-by: Eric Anholt --- .gitlab-ci/lava-gitlab-ci.yml | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to '.gitlab-ci/lava-gitlab-ci.yml') diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml index 6dfe47824f2..6ac3df3be58 100644 --- a/.gitlab-ci/lava-gitlab-ci.yml +++ b/.gitlab-ci/lava-gitlab-ci.yml @@ -11,7 +11,7 @@ include: - .container variables: REPO_SUFFIX: ${CI_JOB_NAME} - DEBIAN_TAG: &debian_tag '2019-12-13-1' + DEBIAN_TAG: &debian_tag '2019-12-17-1' DEBIAN_EXEC: 'DEBIAN_ARCH=${DEBIAN_ARCH} GCC_ARCH=${GCC_ARCH} KERNEL_ARCH=${KERNEL_ARCH} @@ -84,7 +84,7 @@ lava_arm64: - rm -rf /artifacts/rootfs/mesa/include # Pack rootfs - - cp .gitlab-ci/lava-deqp-runner.sh /artifacts/rootfs/deqp/. + - cp .gitlab-ci/deqp-runner.sh /artifacts/rootfs/deqp/. - cp .gitlab-ci/deqp-*-fails.txt /artifacts/rootfs/deqp/. - cp .gitlab-ci/deqp-*-skips.txt /artifacts/rootfs/deqp/. - du -sh /artifacts/rootfs/deqp/* @@ -132,6 +132,8 @@ lava-build:arm64: variables: GIT_STRATEGY: none # testing doesn't build anything from source TAG: *debian_tag + DEQP_PARALLEL: 6 + NIR_VALIDATE: 0 image: $CI_REGISTRY_IMAGE/debian/lava_${DEBIAN_ARCH}:$TAG script: - lava_job_id=`lavacli jobs submit $CI_PROJECT_DIR/results/lava-deqp-$DEVICE_TYPE.yml` -- cgit v1.2.3