From 427c34eeca918c80f58de9fd14a0a52a9e4be933 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Martin=20Roukala=20=28n=C3=A9=20Peres=29?= Date: Fri, 10 Jun 2022 14:58:06 +0300 Subject: [PATCH] ci/valve: do not extract the install tarball on the runner MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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) Reviewed-by: Samuel Pitoiset Part-of: --- .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 d159fac..7f724c8 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 () { -- 2.7.4