From 22d976454f4e50142116f4544c0bbf11134ce991 Mon Sep 17 00:00:00 2001 From: Tomeu Vizoso Date: Tue, 17 Dec 2019 11:50:14 +0100 Subject: gitlab-ci: Consolidate container and build stages for LAVA Use the normal build job to also prepare the artifacts for LAVA jobs. For that, the build container needs to also build the test suites, kernel, ramdisk, etc. Then the build job will place the just-built Mesa in the ramdisk and the test job can generate a LAVA job and point to those artifacts. Signed-off-by: Tomeu Vizoso Acked-by: Alyssa Rosenzweig Reviewed-by: Daniel Stone Tested-by: Marge Bot Part-of: --- .gitlab-ci/lava-deqp.yml.jinja2 | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to '.gitlab-ci/lava-deqp.yml.jinja2') diff --git a/.gitlab-ci/lava-deqp.yml.jinja2 b/.gitlab-ci/lava-deqp.yml.jinja2 index 55b87ba6123..c974a66788d 100644 --- a/.gitlab-ci/lava-deqp.yml.jinja2 +++ b/.gitlab-ci/lava-deqp.yml.jinja2 @@ -1,5 +1,5 @@ job_name: mesa-deqp-{{ gpu_version }} -device_type: {{ lava_device_type }} +device_type: {{ device_type }} timeouts: job: minutes: 40 @@ -23,7 +23,9 @@ actions: to: tftp kernel: url: {{ base_artifacts_url }}/{{ kernel_image_name }} +{% if kernel_image_type %} {{ kernel_image_type }} +{% endif %} ramdisk: url: {{ base_artifacts_url }}/lava-rootfs-{{ arch }}.cpio.gz compression: gz @@ -58,12 +60,14 @@ actions: - mkdir -p /dev/pts - mount -t devpts devpts /dev/pts - - export MESA_GLES_VERSION_OVERRIDE=3.0 - - export DEQP_PARALLEL=6 +{% if env_vars %} + - export {{ env_vars }} +{% endif %} + - export DEQP_NO_SAVE_RESULTS=1 - 'export DEQP_RUNNER_OPTIONS="--compact-display false --shuffle false"' - - export DEQP_EXPECTED_FAILS={{ fails_file }} - - export DEQP_SKIPS={{ skips_file }} + - export DEQP_EXPECTED_FAILS=deqp-{{ gpu_version }}-fails.txt + - export DEQP_SKIPS=deqp-{{ gpu_version }}-skips.txt - export DEQP_VER={{ deqp_version }} - export LIBGL_DRIVERS_PATH=`pwd`/install/lib/dri -- cgit v1.2.3