Mesa (master): ci: Uprev deqp runner to 0.6.5.
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Fri Apr 2 19:22:43 UTC 2021
Module: Mesa
Branch: master
Commit: 1b35cc29dd2e29f8072f4079d678f1d722bdd48e
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=1b35cc29dd2e29f8072f4079d678f1d722bdd48e
Author: Eric Anholt <eric at anholt.net>
Date: Wed Mar 24 10:14:01 2021 -0700
ci: Uprev deqp runner to 0.6.5.
Works around the other Missing case we've seen in CI, possibly fixes the
underlying issue, and adds support for comments in xfails lists.
Reviewed-by: Michel Dänzer <mdaenzer at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9806>
---
.gitlab-ci.yml | 6 +++---
.gitlab-ci/container/build-deqp-runner.sh | 2 +-
.gitlab-ci/lava-gitlab-ci.yml | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 110b9a41fbd..bc006e1670e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -413,13 +413,13 @@ x86_test-base:
x86_test-gl:
extends: .use-x86_test-base
variables:
- MESA_IMAGE_TAG: &x86_test-gl "2021-03-16-piglit-runner"
+ MESA_IMAGE_TAG: &x86_test-gl "2021-03-31-deqp-runner"
# Debian 10 based x86 test image for VK
x86_test-vk:
extends: .use-x86_test-base
variables:
- MESA_IMAGE_TAG: &x86_test-vk "2021-03-16-piglit-runner"
+ MESA_IMAGE_TAG: &x86_test-vk "2021-03-31-deqp-runner"
# Debian 10 based ARM build image
arm_build:
@@ -448,7 +448,7 @@ kernel+rootfs_arm64-baremetal:
variables:
DEBIAN_ARCH: "arm64"
KERNEL_URL: "https://github.com/anholt/linux/archive/mesa-ci-2021-02-17-5.11.tar.gz"
- MESA_ROOTFS_TAG: &arm-baremetal "2021-03-31-libxrender"
+ MESA_ROOTFS_TAG: &arm-baremetal "2021-03-31-deqp-runner"
MINIO_SUFFIX: "baremetal"
# Kernel & rootfs for armhf baremetal testing
diff --git a/.gitlab-ci/container/build-deqp-runner.sh b/.gitlab-ci/container/build-deqp-runner.sh
index 3bf3f223909..cc47b80b738 100644
--- a/.gitlab-ci/container/build-deqp-runner.sh
+++ b/.gitlab-ci/container/build-deqp-runner.sh
@@ -4,6 +4,6 @@ set -ex
cargo install --locked deqp-runner \
-j ${FDO_CI_CONCURRENT:-4} \
- --version 0.6.3 \
+ --version 0.6.5 \
--root /usr/local \
$EXTRA_CARGO_ARGS
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index af5f28acdc1..eda64950a92 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -14,7 +14,7 @@
variables:
KERNEL_URL: "https://gitlab.freedesktop.org/tomeu/linux/-/archive/v5.10-rc2-for-mesa-ci/linux-v5.10-rc2-for-mesa-ci.tar.gz"
INSTALL_KERNEL_MODULES: 1
- MESA_ROOTFS_TAG: &lava-rootfs "2021-03-31-libxrender"
+ MESA_ROOTFS_TAG: &lava-rootfs "2021-03-31-deqp-runner"
MINIO_SUFFIX: "lava"
PIGLIT_BUILD_TARGETS: "piglit_replayer"
More information about the mesa-commit
mailing list