From 1fc1b877622e3477272a17a43fd438453484bb79 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Michel=20D=C3=A4nzer?= Date: Tue, 26 May 2020 11:04:19 +0200 Subject: [PATCH] gitlab-ci: Pull in GCC 9 from Debian testing in x86_test-gl/vk images The GCC 8 packages from buster are no longer compatible with libc6 from testing. We could use the GCC 8 packages from testing instead, but this is easier. v2: * Update piglit-quick_gl test results, due to the piglit issue fixed by https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/294 Reviewed-by: Eric Anholt # v1 Part-of: --- .gitlab-ci.yml | 6 +++--- .gitlab-ci/container/x86_test-gl.sh | 3 +-- .gitlab-ci/container/x86_test-vk.sh | 3 +-- .gitlab-ci/piglit/quick_gl.txt | 12 +++++------- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6e28b47..8103eb6 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -150,7 +150,7 @@ x86_build: x86_test-base: extends: x86_build variables: - FDO_DISTRIBUTION_TAG: &x86_test-base "2020-05-23" + FDO_DISTRIBUTION_TAG: &x86_test-base "2020-05-26" .use-x86_test-base: extends: @@ -167,13 +167,13 @@ x86_test-base: x86_test-gl: extends: .use-x86_test-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-05-23" + FDO_DISTRIBUTION_TAG: &x86_test-gl "2020-05-26" # Debian 10 based x86 test image for VK x86_test-vk: extends: .use-x86_test-base variables: - FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-05-23" + FDO_DISTRIBUTION_TAG: &x86_test-vk "2020-05-26" # Debian 9 based x86 build image (old LLVM) x86_build_old: diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh index a98e165..4ce0dc3 100644 --- a/.gitlab-ci/container/x86_test-gl.sh +++ b/.gitlab-ci/container/x86_test-gl.sh @@ -11,8 +11,6 @@ STABLE_EPHEMERAL=" \ automake \ ccache \ cmake \ - g++ \ - gcc \ libgbm-dev \ libgles2-mesa-dev \ libpcre3-dev \ @@ -33,6 +31,7 @@ STABLE_EPHEMERAL=" \ " TESTING_EPHEMERAL=" \ + g++ \ libc6-dev \ " diff --git a/.gitlab-ci/container/x86_test-vk.sh b/.gitlab-ci/container/x86_test-vk.sh index 670f9e2..0f544b3 100644 --- a/.gitlab-ci/container/x86_test-vk.sh +++ b/.gitlab-ci/container/x86_test-vk.sh @@ -9,8 +9,6 @@ export DEBIAN_FRONTEND=noninteractive STABLE_EPHEMERAL=" \ ccache \ cmake \ - g++ \ - gcc \ libgbm-dev \ libgles2-mesa-dev \ liblz4-dev \ @@ -29,6 +27,7 @@ STABLE_EPHEMERAL=" \ " TESTING_EPHEMERAL=" \ + g++ \ libc6-dev \ " diff --git a/.gitlab-ci/piglit/quick_gl.txt b/.gitlab-ci/piglit/quick_gl.txt index 2e0134c..60bcc94 100644 --- a/.gitlab-ci/piglit/quick_gl.txt +++ b/.gitlab-ci/piglit/quick_gl.txt @@ -1573,10 +1573,8 @@ spec/intel_conservative_rasterization/intel_conservative_rasterization-invalid: spec/intel_conservative_rasterization/intel_conservative_rasterization-invalid_gles3: skip spec/intel_conservative_rasterization/intel_conservative_rasterization-tri: skip spec/intel_conservative_rasterization/intel_conservative_rasterization-tri_gles3: skip -spec/khr_texture_compression_astc/array-gl/12x12 block dim: fail -spec/khr_texture_compression_astc/array-gl/5x5 block dim: fail -spec/khr_texture_compression_astc/array-gles/12x12 block dim: fail -spec/khr_texture_compression_astc/array-gles/5x5 block dim: fail +spec/khr_texture_compression_astc/array-gl: skip +spec/khr_texture_compression_astc/array-gles: skip spec/khr_texture_compression_astc/miptree-gl hdr/hdr: notrun spec/khr_texture_compression_astc/miptree-gl ldr/ldr: notrun spec/khr_texture_compression_astc/miptree-gl ldr/ldr profile: fail @@ -1713,9 +1711,9 @@ summary: name: results ---- -------- pass: 20703 - fail: 222 + fail: 218 crash: 0 - skip: 1465 + skip: 1467 timeout: 0 warn: 6 incomplete: 0 @@ -1724,4 +1722,4 @@ summary: changes: 0 fixes: 0 regressions: 0 - total: 22414 + total: 22412 -- 2.7.4