ci: Use lock file to build deqp-runner
Build deqp-runner with the `--locked` option to use dependencies versions specified in `Cargo.lock`. v2: Bump image tags. Signed-off-by: Antonio Caggiano <antonio.caggiano@collabora.com> Suggested-by: Tomeu Vizoso <tomeu.vizoso@collabora.com> Reviewed-by: Eric Anholt <eric@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9368>
This commit is contained in:

committed by
Marge Bot

parent
a0cc0b3a15
commit
810c39b067
@@ -411,13 +411,13 @@ x86_test-base:
|
|||||||
x86_test-gl:
|
x86_test-gl:
|
||||||
extends: .use-x86_test-base
|
extends: .use-x86_test-base
|
||||||
variables:
|
variables:
|
||||||
MESA_IMAGE_TAG: &x86_test-gl "2021-02-17-gfxreconstruct-master"
|
MESA_IMAGE_TAG: &x86_test-gl "2021-03-02-lock-deqp-runner"
|
||||||
|
|
||||||
# Debian 10 based x86 test image for VK
|
# Debian 10 based x86 test image for VK
|
||||||
x86_test-vk:
|
x86_test-vk:
|
||||||
extends: .use-x86_test-base
|
extends: .use-x86_test-base
|
||||||
variables:
|
variables:
|
||||||
MESA_IMAGE_TAG: &x86_test-vk "2021-02-18-add-libdrm"
|
MESA_IMAGE_TAG: &x86_test-vk "2021-03-02-lock-deqp-runner"
|
||||||
|
|
||||||
# Debian 10 based ARM build image
|
# Debian 10 based ARM build image
|
||||||
arm_build:
|
arm_build:
|
||||||
@@ -459,7 +459,7 @@ arm64_test:
|
|||||||
extends:
|
extends:
|
||||||
- .use-arm_test-base
|
- .use-arm_test-base
|
||||||
variables:
|
variables:
|
||||||
MESA_IMAGE_TAG: &arm64_test "2021-02-18-kernel"
|
MESA_IMAGE_TAG: &arm64_test "2021-03-02-lock-deqp-runner"
|
||||||
|
|
||||||
.use-arm64_test:
|
.use-arm64_test:
|
||||||
extends:
|
extends:
|
||||||
@@ -476,7 +476,7 @@ armhf_test:
|
|||||||
extends:
|
extends:
|
||||||
- .use-arm_test-base
|
- .use-arm_test-base
|
||||||
variables:
|
variables:
|
||||||
MESA_IMAGE_TAG: &armhf_test "2021-02-18-kernel"
|
MESA_IMAGE_TAG: &armhf_test "2021-03-02-lock-deqp-runner"
|
||||||
|
|
||||||
.use-armhf_test:
|
.use-armhf_test:
|
||||||
extends:
|
extends:
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
|
|
||||||
set -ex
|
set -ex
|
||||||
|
|
||||||
cargo install deqp-runner \
|
cargo install --locked deqp-runner \
|
||||||
-j ${FDO_CI_CONCURRENT:-4} \
|
-j ${FDO_CI_CONCURRENT:-4} \
|
||||||
--version 0.5.1 \
|
--version 0.5.1 \
|
||||||
--root /usr/local \
|
--root /usr/local \
|
||||||
|
@@ -1,5 +1,5 @@
|
|||||||
variables:
|
variables:
|
||||||
MESA_LAVA_TAG: "2021-02-17-asan"
|
MESA_LAVA_TAG: "2021-03-02-lock-deqp-runner"
|
||||||
|
|
||||||
.kernel+rootfs:
|
.kernel+rootfs:
|
||||||
stage: container-2
|
stage: container-2
|
||||||
|
Reference in New Issue
Block a user