From 02587c1dd0ad03ec18ea9b879e23e5e4a7baff0d Mon Sep 17 00:00:00 2001 From: Andres Gomez Date: Mon, 14 Jun 2021 16:20:07 +0300 Subject: [PATCH] ci: bump x86_test-base tag MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit When adding crosvm to the x86_test-gl building deqp-runner was also mistakenly introduced. deqp-runner is already included in the x86_test-base image. Additionally, when bumping the deqp-runner version, only the x86_test-gl tag was updated. Now, we remove the unnecessary build from x86_test-gl and bump the tag for the x86_test-base image. v2: - Bump x86_test-gl, not x86_test-vk (Tomeu). v3: add in fixes for duplicated lines in lvp xfails (Anholt) Fixes: dc9cd18f522 ("ci: Build Crosvm in our container") Fixes: 53826932db5 ("ci: Update piglit and deqp/piglit-runner.") Signed-off-by: Andres Gomez Reviewed-by: Corentin Noël Reviewed-by: Martin Peres Reviewed-by: Emma Anholt Part-of: --- .gitlab-ci.yml | 4 ++-- .gitlab-ci/container/x86_test-gl.sh | 4 +--- src/gallium/frontends/lavapipe/ci/deqp-lvp-fails.txt | 8 -------- 3 files changed, 3 insertions(+), 13 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 1f0fefa..9e017bd 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -403,7 +403,7 @@ android_build: x86_test-base: extends: x86_build-base variables: - MESA_IMAGE_TAG: &x86_test-base "2021-03-31-cargo" + MESA_IMAGE_TAG: &x86_test-base "2021-06-13-deqp-runner" .use-x86_test-base: extends: @@ -421,7 +421,7 @@ x86_test-gl: variables: FDO_DISTRIBUTION_EXEC: 'env KERNEL_URL=${KERNEL_URL} FDO_CI_CONCURRENT=${FDO_CI_CONCURRENT} bash .gitlab-ci/container/${CI_JOB_NAME}.sh' KERNEL_URL: &kernel-rootfs-url "https://gitlab.freedesktop.org/gfx-ci/linux/-/archive/v5.13-rc5-for-mesa-ci-27df41f1e0cf/linux-v5.13-rc5-for-mesa-ci-27df41f1e0cf.tar.bz2" - MESA_IMAGE_TAG: &x86_test-gl "2021-06-10-piglit" + MESA_IMAGE_TAG: &x86_test-gl "2021-06-13-deqp-runner" # Debian 11 based x86 test image for VK x86_test-vk: diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh index e3d03a1..3e265fd 100644 --- a/.gitlab-ci/container/x86_test-gl.sh +++ b/.gitlab-ci/container/x86_test-gl.sh @@ -98,11 +98,9 @@ mkdir -p /lava-files/ PIGLIT_OPTS="-DPIGLIT_BUILD_CL_TESTS=ON" . .gitlab-ci/container/build-piglit.sh -############### Build Rust deps (Crosvm and deqp-runner) +############### Build Crosvm . .gitlab-ci/container/build-crosvm.sh -. .gitlab-ci/container/build-deqp-runner.sh - rm -rf /root/.cargo ############### Build dEQP GL diff --git a/src/gallium/frontends/lavapipe/ci/deqp-lvp-fails.txt b/src/gallium/frontends/lavapipe/ci/deqp-lvp-fails.txt index ccb2498..4137463 100644 --- a/src/gallium/frontends/lavapipe/ci/deqp-lvp-fails.txt +++ b/src/gallium/frontends/lavapipe/ci/deqp-lvp-fails.txt @@ -29,7 +29,6 @@ dEQP-VK.glsl.texture_functions.query.texturequerylod.sampler2darrayshadow_fragme dEQP-VK.glsl.texture_functions.query.texturequerylod.sampler2dshadow_fragment,Fail dEQP-VK.glsl.texture_functions.query.texturequerylod.usampler1darray_fragment,Fail dEQP-VK.image.mismatched_formats.image_write.a8b8g8r8_srgb_pack32_with_rgb10a2,Crash -dEQP-VK.image.mismatched_formats.image_write.a8b8g8r8_srgb_pack32_with_rgb10a2,Crash dEQP-VK.image.mismatched_formats.image_write.b8g8r8a8_srgb_with_rgba8,Crash dEQP-VK.image.mismatched_formats.image_write.r8g8b8a8_srgb_with_rgb10a2,Crash dEQP-VK.rasterization.interpolation.projected.non_strict_lines,Fail @@ -47,7 +46,6 @@ dEQP-VK.texture.filtering.2d.combinations.linear_mipmap_linear.nearest.repeat.mi dEQP-VK.texture.filtering.2d.combinations.linear_mipmap_linear.nearest.repeat.repeat,Fail dEQP-VK.texture.filtering.2d.combinations.nearest_mipmap_linear.linear.clamp_to_edge.mirror_clamp_to_edge,Fail dEQP-VK.texture.filtering.2d.combinations.nearest_mipmap_linear.linear.clamp_to_edge.repeat,Fail -dEQP-VK.texture.filtering.2d.combinations.nearest_mipmap_linear.linear.clamp_to_edge.repeat,Fail dEQP-VK.texture.filtering.2d.combinations.nearest_mipmap_linear.linear.mirror_clamp_to_edge.mirror_clamp_to_edge,Fail dEQP-VK.texture.filtering.2d.combinations.nearest_mipmap_linear.linear.mirror_clamp_to_edge.repeat,Fail dEQP-VK.texture.filtering.2d.combinations.nearest_mipmap_linear.linear.mirrored_repeat.repeat,Fail @@ -92,7 +90,6 @@ dEQP-VK.texture.filtering.2d_array.combinations.nearest_mipmap_linear.nearest.mi dEQP-VK.texture.filtering.2d_array.combinations.nearest_mipmap_linear.nearest.repeat.mirrored_repeat,Fail dEQP-VK.texture.filtering.2d_array.combinations.nearest_mipmap_linear.nearest.repeat.repeat,Fail dEQP-VK.texture.filtering.2d_array.formats.a1r5g5b5_unorm.a1r5g5b5_unorm_linear_mipmap_linear,Fail -dEQP-VK.texture.filtering.2d_array.formats.a1r5g5b5_unorm.a1r5g5b5_unorm_linear_mipmap_linear,Fail dEQP-VK.texture.filtering.2d_array.formats.a8b8g8r8_srgb.a8b8g8r8_srgb_linear_mipmap_linear,Fail dEQP-VK.texture.filtering.2d_array.formats.b10g11r11_ufloat.b10g11r11_ufloat_linear_mipmap_linear,Fail dEQP-VK.texture.filtering.2d_array.formats.e5b9g9r9_ufloat.e5b9g9r9_ufloat_nearest_mipmap_linear,Fail @@ -113,12 +110,10 @@ dEQP-VK.texture.filtering.3d.combinations.linear_mipmap_linear.nearest.clamp_to_ dEQP-VK.texture.filtering.3d.combinations.linear_mipmap_linear.nearest.clamp_to_edge.mirror_clamp_to_edge.mirrored_repeat,Fail dEQP-VK.texture.filtering.3d.combinations.linear_mipmap_linear.nearest.clamp_to_edge.repeat.mirrored_repeat,Fail dEQP-VK.texture.filtering.3d.combinations.linear_mipmap_linear.nearest.mirror_clamp_to_edge.clamp_to_edge.mirrored_repeat,Fail -dEQP-VK.texture.filtering.3d.combinations.linear_mipmap_linear.nearest.mirror_clamp_to_edge.clamp_to_edge.mirrored_repeat,Fail dEQP-VK.texture.filtering.3d.combinations.linear_mipmap_linear.nearest.mirror_clamp_to_edge.mirror_clamp_to_edge.mirrored_repeat,Fail dEQP-VK.texture.filtering.3d.combinations.linear_mipmap_linear.nearest.mirror_clamp_to_edge.repeat.mirrored_repeat,Fail dEQP-VK.texture.filtering.3d.combinations.linear_mipmap_linear.nearest.mirrored_repeat.mirrored_repeat.mirrored_repeat,Fail dEQP-VK.texture.filtering.3d.combinations.linear_mipmap_linear.nearest.repeat.clamp_to_edge.mirrored_repeat,Fail -dEQP-VK.texture.filtering.3d.combinations.linear_mipmap_linear.nearest.repeat.clamp_to_edge.mirrored_repeat,Fail dEQP-VK.texture.filtering.3d.combinations.linear_mipmap_linear.nearest.repeat.mirror_clamp_to_edge.mirrored_repeat,Fail dEQP-VK.texture.filtering.3d.combinations.linear_mipmap_linear.nearest.repeat.repeat.mirrored_repeat,Fail dEQP-VK.texture.filtering.3d.combinations.nearest_mipmap_linear.linear.clamp_to_edge.clamp_to_edge.mirrored_repeat,Fail @@ -136,7 +131,6 @@ dEQP-VK.texture.filtering.3d.combinations.nearest_mipmap_linear.linear.mirror_cl dEQP-VK.texture.filtering.3d.combinations.nearest_mipmap_linear.linear.mirror_clamp_to_edge.repeat.mirrored_repeat,Fail dEQP-VK.texture.filtering.3d.combinations.nearest_mipmap_linear.linear.mirror_clamp_to_edge.repeat.repeat,Fail dEQP-VK.texture.filtering.3d.combinations.nearest_mipmap_linear.linear.mirrored_repeat.clamp_to_edge.mirrored_repeat,Fail -dEQP-VK.texture.filtering.3d.combinations.nearest_mipmap_linear.linear.mirrored_repeat.clamp_to_edge.mirrored_repeat,Fail dEQP-VK.texture.filtering.3d.combinations.nearest_mipmap_linear.linear.mirrored_repeat.mirror_clamp_to_edge.mirrored_repeat,Fail dEQP-VK.texture.filtering.3d.combinations.nearest_mipmap_linear.linear.mirrored_repeat.mirrored_repeat.mirrored_repeat,Fail dEQP-VK.texture.filtering.3d.combinations.nearest_mipmap_linear.linear.mirrored_repeat.mirrored_repeat.repeat,Fail @@ -149,7 +143,6 @@ dEQP-VK.texture.filtering.3d.combinations.nearest_mipmap_linear.linear.repeat.mi dEQP-VK.texture.filtering.3d.combinations.nearest_mipmap_linear.linear.repeat.repeat.mirrored_repeat,Fail dEQP-VK.texture.filtering.3d.combinations.nearest_mipmap_linear.linear.repeat.repeat.repeat,Fail dEQP-VK.texture.filtering.3d.combinations.nearest_mipmap_linear.nearest.clamp_to_edge.clamp_to_edge.mirrored_repeat,Fail -dEQP-VK.texture.filtering.3d.combinations.nearest_mipmap_linear.nearest.clamp_to_edge.clamp_to_edge.mirrored_repeat,Fail dEQP-VK.texture.filtering.3d.combinations.nearest_mipmap_linear.nearest.clamp_to_edge.mirror_clamp_to_edge.mirrored_repeat,Fail dEQP-VK.texture.filtering.3d.combinations.nearest_mipmap_linear.nearest.clamp_to_edge.mirrored_repeat.mirrored_repeat,Fail dEQP-VK.texture.filtering.3d.combinations.nearest_mipmap_linear.nearest.clamp_to_edge.mirrored_repeat.repeat,Fail @@ -194,7 +187,6 @@ dEQP-VK.texture.filtering.cube.combinations.linear_mipmap_linear.nearest.clamp_t dEQP-VK.texture.filtering.cube.combinations.linear_mipmap_linear.nearest.clamp_to_border.mirrored_repeat,Fail dEQP-VK.texture.filtering.cube.combinations.linear_mipmap_linear.nearest.clamp_to_edge.clamp_to_border,Fail dEQP-VK.texture.filtering.cube.combinations.linear_mipmap_linear.nearest.mirror_clamp_to_edge.clamp_to_border,Fail -dEQP-VK.texture.filtering.cube.combinations.linear_mipmap_linear.nearest.mirror_clamp_to_edge.clamp_to_border,Fail dEQP-VK.texture.filtering.cube.combinations.linear_mipmap_linear.nearest.mirrored_repeat.clamp_to_border,Fail dEQP-VK.texture.filtering.cube.combinations.linear_mipmap_linear.nearest.mirrored_repeat.clamp_to_edge,Fail dEQP-VK.texture.filtering.cube.combinations.linear_mipmap_linear.nearest.mirrored_repeat.mirrored_repeat,Fail -- 2.7.4