Mesa (main): ci/valve: do not extract the install tarball on the runner
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Jun 14 07:31:36 UTC 2022
Module: Mesa
Branch: main
Commit: 427c34eeca918c80f58de9fd14a0a52a9e4be933
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=427c34eeca918c80f58de9fd14a0a52a9e4be933
Author: Martin Roukala (né Peres) <martin.roukala at mupuf.org>
Date: Fri Jun 10 14:58:06 2022 +0300
ci/valve: do not extract the install tarball on the runner
Until now, we have been extracing the install.tar image on the gitlab
runner before sharing it to the test machine through a MINIO bucket.
It turns out that hardlinks and symlinks do not get shared, so let's
just extract the tarball directly on the test machine to fix the issue.
Signed-off-by: Martin Roukala (né Peres) <martin.roukala at mupuf.org>
Reviewed-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16968>
---
.gitlab-ci/test/gitlab-ci.yml | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml
index d159fac70c5..7f724c86452 100644
--- a/.gitlab-ci/test/gitlab-ci.yml
+++ b/.gitlab-ci/test/gitlab-ci.yml
@@ -214,7 +214,8 @@
# we rename the MESA_IMAGE variable into IMAGE_UNDER_TEST.
IMAGE_UNDER_TEST: "$MESA_IMAGE"
- INSTALL_TARBALL: "./artifacts/install.tar"
+ INSTALL_TARBALL_NAME: "install.tar"
+ INSTALL_TARBALL: "./artifacts/${INSTALL_TARBALL_NAME}"
CI_VALVE_ARTIFACTS: "./artifacts/valve"
CI_COMMON_SCRIPTS: "./artifacts/ci-common"
GENERATE_ENV_SCRIPT: "${CI_COMMON_SCRIPTS}/generate-env.sh"
@@ -246,7 +247,7 @@
[ -d "$CI_COMMON_SCRIPTS" ] || exit 1
- B2C_TEST_SCRIPT="bash -c 'source ./set-job-env-vars.sh ; ${B2C_TEST_SCRIPT}'"
+ B2C_TEST_SCRIPT="bash -c 'source ./set-job-env-vars.sh; tar xf ${INSTALL_TARBALL_NAME}; ${B2C_TEST_SCRIPT}'"
# The Valve CI gateway receives jobs in a YAML format. Create a
# job description from the CI environment.
@@ -289,9 +290,8 @@
echo "export CI_JOB_JWT=${CI_JOB_JWT}" >> ${JOB_FOLDER}/set-job-env-vars.sh
set -x
- # Extract the Mesa distribution into the location expected by
- # the Mesa CI deqp-runner scripts.
- tar x -C ${JOB_FOLDER} -f $INSTALL_TARBALL
+ # Copy the mesa install tarball to the job folder, for later extraction
+ mv "${INSTALL_TARBALL}" "${JOB_FOLDER}"
script: |
slugify () {
More information about the mesa-commit
mailing list