mirrors/mesa
0
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2024-11-27 12:14:10 +08:00
Code Issues Packages Projects Releases Wiki Activity

ci: Uprev deqp runner to 0.6.5.

Browse Source 
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@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9806>
This commit is contained in:
Eric Anholt 2021-03-24 10:14:01 -07:00 committed by Marge Bot
parent f67b6f9c47
commit 1b35cc29dd
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci.yml
View File

@ -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

2
.gitlab-ci/container/build-deqp-runner.sh
View File

@ -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

2
.gitlab-ci/lava-gitlab-ci.yml
View File

@ -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"