diff options
| author | Martin Roukala (né Peres) <martin.roukala@mupuf.org> | 2023-03-14 09:51:20 +0200 |
|---|---|---|
| committer | Marge Bot <emma+marge@anholt.net> | 2023-03-14 17:22:07 +0000 |
| commit | 10e0c5fd466cf08e572d1493c5af0de97bc2861d (patch) | |
| tree | a892ff9d3dbe1ab168fbb1c1bc64157db354527f /.gitlab-ci | |
| parent | a0d8ed757ec39131a76b11ce8be41e8bb7f2fd63 (diff) | |
ci/b2c: move away from the hand-rolled initscript
Up until now, we have been handrolling part of the init-stage2.sh in
the b2c command line. Let's stop doing that and instead use the same
script as every other HW farms.
Signed-off-by: Martin Roukala (né Peres) <martin.roukala@mupuf.org>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/21872>
Diffstat (limited to '.gitlab-ci')
| -rw-r--r-- | .gitlab-ci/test/gitlab-ci.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab-ci/test/gitlab-ci.yml b/.gitlab-ci/test/gitlab-ci.yml index 1981ad2aadd..98a6deabcb4 100644 --- a/.gitlab-ci/test/gitlab-ci.yml +++ b/.gitlab-ci/test/gitlab-ci.yml @@ -284,7 +284,7 @@ rustfmt: [ -d "$CI_COMMON_SCRIPTS" ] || exit 1 - B2C_TEST_SCRIPT="bash -c 'source ./set-job-env-vars.sh; source ./setup-test-env.sh; tar xf ${INSTALL_TARBALL_NAME}; ${B2C_TEST_SCRIPT}'" + B2C_TEST_SCRIPT="bash -c 'tar xf ${INSTALL_TARBALL_NAME}; ./install/common/init-stage2.sh'" # The Valve CI gateway receives jobs in a YAML format. Create a # job description from the CI environment. @@ -321,11 +321,11 @@ rustfmt: # begins running on the remote DUT. set +x "$CI_COMMON_SCRIPTS"/generate-env.sh > ${JOB_FOLDER}/set-job-env-vars.sh + echo "export SCRIPTS_DIR=./install" >> ${JOB_FOLDER}/set-job-env-vars.sh chmod +x ${JOB_FOLDER}/set-job-env-vars.sh echo "Variables passed through:" cat ${JOB_FOLDER}/set-job-env-vars.sh echo "export CI_JOB_JWT=${CI_JOB_JWT}" >> ${JOB_FOLDER}/set-job-env-vars.sh - cp ${SCRIPTS_DIR}/setup-test-env.sh ${JOB_FOLDER}/setup-test-env.sh set -x # Copy the mesa install tarball to the job folder, for later extraction |