diff options
| author | Andres Gomez <agomez@igalia.com> | 2021-06-14 16:20:07 +0300 |
|---|---|---|
| committer | Marge Bot <eric+marge@anholt.net> | 2021-06-14 18:44:04 +0000 |
| commit | 02587c1dd0ad03ec18ea9b879e23e5e4a7baff0d (patch) | |
| tree | 8570eb32e6761c3d7768dd0bcde12e6e3423b2fe /.gitlab-ci | |
| parent | c4a32927abe911e67933aa0fb67790001ebbb239 (diff) | |
ci: bump x86_test-base tag
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 <agomez@igalia.com>
Reviewed-by: Corentin Noël <corentin.noel@collabora.com>
Reviewed-by: Martin Peres <martin.peres@mupuf.org>
Reviewed-by: Emma Anholt <emma@anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11359>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/container/x86_test-gl.sh | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/.gitlab-ci/container/x86_test-gl.sh b/.gitlab-ci/container/x86_test-gl.sh index e3d03a13257..3e265fd12d1 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 |