Mesa (master): ci: Use lock file to build deqp-runner

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 810c39b0675b3923a55a17dd3b517d65d54c3a37
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=810c39b0675b3923a55a17dd3b517d65d54c3a37

Author: Antonio Caggiano <antonio.caggiano at collabora.com>
Date:   Tue Mar  2 16:01:05 2021 +0100

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 at collabora.com>
Suggested-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9368>

---

 .gitlab-ci.yml                            | 8 ++++----
 .gitlab-ci/container/build-deqp-runner.sh | 2 +-
 .gitlab-ci/lava-gitlab-ci.yml             | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0f0a7a79698..9529e5dc6e9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -411,13 +411,13 @@ x86_test-base:
 x86_test-gl:
   extends: .use-x86_test-base
   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
 x86_test-vk:
   extends: .use-x86_test-base
   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
 arm_build:
@@ -459,7 +459,7 @@ arm64_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &arm64_test "2021-02-18-kernel"
+    MESA_IMAGE_TAG: &arm64_test "2021-03-02-lock-deqp-runner"
 
 .use-arm64_test:
   extends:
@@ -476,7 +476,7 @@ armhf_test:
   extends:
     - .use-arm_test-base
   variables:
-    MESA_IMAGE_TAG: &armhf_test "2021-02-18-kernel"
+    MESA_IMAGE_TAG: &armhf_test "2021-03-02-lock-deqp-runner"
 
 .use-armhf_test:
   extends:
diff --git a/.gitlab-ci/container/build-deqp-runner.sh b/.gitlab-ci/container/build-deqp-runner.sh
index 7efa1dbc14f..f83cfa4e2ac 100644
--- a/.gitlab-ci/container/build-deqp-runner.sh
+++ b/.gitlab-ci/container/build-deqp-runner.sh
@@ -2,7 +2,7 @@
 
 set -ex
 
-cargo install deqp-runner \
+cargo install --locked deqp-runner \
   -j ${FDO_CI_CONCURRENT:-4} \
   --version 0.5.1 \
   --root /usr/local \
diff --git a/.gitlab-ci/lava-gitlab-ci.yml b/.gitlab-ci/lava-gitlab-ci.yml
index 56ca35fcfa6..a27f3a6be87 100644
--- a/.gitlab-ci/lava-gitlab-ci.yml
+++ b/.gitlab-ci/lava-gitlab-ci.yml
@@ -1,5 +1,5 @@
 variables:
-  MESA_LAVA_TAG: "2021-02-17-asan"
+  MESA_LAVA_TAG: "2021-03-02-lock-deqp-runner"
 
 .kernel+rootfs:
   stage: container-2