Mesa (staging/22.0): ci: Avoid altering EXTRA_CARGO_ARGS environment variable

[GitLab Mirror]

Module: Mesa
Branch: staging/22.0
Commit: b7a3e874edc040f09de8a294804ce02772ca45fc
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=b7a3e874edc040f09de8a294804ce02772ca45fc

Author: Cristian Ciocaltea <cristian.ciocaltea at collabora.com>
Date:   Mon Feb 21 16:30:13 2022 +0200

ci: Avoid altering EXTRA_CARGO_ARGS environment variable

Use a dedicated DEQP_RUNNER_CARGO_ARGS variable instead of
EXTRA_CARGO_ARGS in build-deqp-runner.sh to pass custom arguments when
invoking 'cargo install'.

This is to avoid modifications of EXTRA_CARGO_ARGS which might have
negative side-effects in the scripts which rely on this variable and
import build-deqp-runner.sh instead of executing it in a subshell.

Fixes: 8729c6e9818 ("ci: Support building and installing deqp-runner from source")
Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea at collabora.com>
Reviewed-by: Guilherme Gallo <guilherme.gallo at collabora.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/15208>
(cherry picked from commit e7ab2ba94e6306d4620453d57651474ed02414a7)

Conflicts:
	.gitlab-ci/container/build-deqp-runner.sh

---

 .gitlab-ci/container/build-deqp-runner.sh | 12 +++++++-----
 .pick_status.json                         |  2 +-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.gitlab-ci/container/build-deqp-runner.sh b/.gitlab-ci/container/build-deqp-runner.sh
index 7919f0c74d0..8b7b8d89444 100644
--- a/.gitlab-ci/container/build-deqp-runner.sh
+++ b/.gitlab-ci/container/build-deqp-runner.sh
@@ -4,19 +4,21 @@ set -ex
 
 if [ -n "${DEQP_RUNNER_GIT_TAG}${DEQP_RUNNER_GIT_REV}" ]; then
     # Build and install from source
-    EXTRA_CARGO_ARGS="--git ${DEQP_RUNNER_GIT_URL:-https://gitlab.freedesktop.org/anholt/deqp-runner.git} ${EXTRA_CARGO_ARGS}"
+    DEQP_RUNNER_CARGO_ARGS="--git ${DEQP_RUNNER_GIT_URL:-https://gitlab.freedesktop.org/anholt/deqp-runner.git}"
 
     if [ -n "${DEQP_RUNNER_GIT_TAG}" ]; then
-        EXTRA_CARGO_ARGS="--tag ${DEQP_RUNNER_GIT_TAG} ${EXTRA_CARGO_ARGS}"
+        DEQP_RUNNER_CARGO_ARGS="--tag ${DEQP_RUNNER_GIT_TAG} ${DEQP_RUNNER_CARGO_ARGS}"
     else
-        EXTRA_CARGO_ARGS="--rev ${DEQP_RUNNER_GIT_REV} ${EXTRA_CARGO_ARGS}"
+        DEQP_RUNNER_CARGO_ARGS="--rev ${DEQP_RUNNER_GIT_REV} ${DEQP_RUNNER_CARGO_ARGS}"
     fi
+
+    DEQP_RUNNER_CARGO_ARGS="${DEQP_RUNNER_CARGO_ARGS} ${EXTRA_CARGO_ARGS}"
 else
     # Install from package registry
-    EXTRA_CARGO_ARGS="--version 0.11.0 ${EXTRA_CARGO_ARGS} -- deqp-runner"
+    DEQP_RUNNER_CARGO_ARGS="--version 0.11.0 ${EXTRA_CARGO_ARGS} -- deqp-runner"
 fi
 
 cargo install --locked  \
     -j ${FDO_CI_CONCURRENT:-4} \
     --root /usr/local \
-    ${EXTRA_CARGO_ARGS}
+    ${DEQP_RUNNER_CARGO_ARGS}
diff --git a/.pick_status.json b/.pick_status.json
index 683b159de6b..a9185c8b08c 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -7644,7 +7644,7 @@
         "description": "ci: Avoid altering EXTRA_CARGO_ARGS environment variable",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 5,
+        "resolution": 1,
         "because_sha": "8729c6e98186b2feab4466ca288876e3a1078f6c"
     },
     {