fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-21 00:40:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

ci: rename generate-env.sh to export-gitlab-job-env-for-dut.sh

Browse source 
This makes it clearer what this script does.

Reviewed-by: Vignesh Raman <None>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33037>
This commit is contained in:
Eric Engestrom 2025-02-11 18:34:33 +05:30 • committed by Marge Bot
parent 49a04bb41e
commit 55bd96d038
5 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci/bare-metal/rootfs-setup.sh
View file

@ -23,7 +23,7 @@ set +x
# Pass through relevant env vars from the gitlab job to the baremetal init script # Pass through relevant env vars from the gitlab job to the baremetal init script
echo "Variables passed through:" echo "Variables passed through:"
"$CI_COMMON"/generate-env.sh | tee $rootfs_dst/set-job-env-vars.sh "$CI_COMMON"/export-gitlab-job-env-for-dut.sh | tee $rootfs_dst/set-job-env-vars.sh
set -x set -x

0
.gitlab-ci/common/generate-env.sh → .gitlab-ci/common/export-gitlab-job-env-for-dut.sh
View file

2
.gitlab-ci/crosvm-runner.sh
View file

@ -76,7 +76,7 @@ set_vsock_context || { echo "Could not generate crosvm vsock CID" >&2; exit 1; }
# Securely pass the current variables to the crosvm environment # Securely pass the current variables to the crosvm environment
echo "Variables passed through:" echo "Variables passed through:"
SCRIPTS_DIR=$(readlink -en "${0%/*}") SCRIPTS_DIR=$(readlink -en "${0%/*}")
${SCRIPTS_DIR}/common/generate-env.sh | tee ${VM_TEMP_DIR}/crosvm-env.sh ${SCRIPTS_DIR}/common/export-gitlab-job-env-for-dut.sh | tee ${VM_TEMP_DIR}/crosvm-env.sh
cp ${SCRIPTS_DIR}/setup-test-env.sh ${VM_TEMP_DIR}/setup-test-env.sh cp ${SCRIPTS_DIR}/setup-test-env.sh ${VM_TEMP_DIR}/setup-test-env.sh
# Set the crosvm-script as the arguments of the current script # Set the crosvm-script as the arguments of the current script

2
.gitlab-ci/lava/lava-submit.sh
View file

@ -47,7 +47,7 @@ ROOTFS_URL="$(get_path_to_artifact lava-rootfs.tar.zst)"
rm -rf results rm -rf results
mkdir -p results/job-rootfs-overlay/ mkdir -p results/job-rootfs-overlay/
artifacts/ci-common/generate-env.sh > results/job-rootfs-overlay/set-job-env-vars.sh artifacts/ci-common/export-gitlab-job-env-for-dut.sh > results/job-rootfs-overlay/set-job-env-vars.sh
cp artifacts/ci-common/init-*.sh results/job-rootfs-overlay/ cp artifacts/ci-common/init-*.sh results/job-rootfs-overlay/
cp "$SCRIPTS_DIR"/setup-test-env.sh results/job-rootfs-overlay/ cp "$SCRIPTS_DIR"/setup-test-env.sh results/job-rootfs-overlay/

4
.gitlab-ci/test/gitlab-ci.yml
View file

@ -167,7 +167,7 @@ yaml-toml-shell-py-test:
HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh" HWCI_TEST_SCRIPT: "/install/piglit/piglit-runner.sh"
script: script:
- section_start variables "Variables passed through:" - section_start variables "Variables passed through:"
- install/common/generate-env.sh - install/common/export-gitlab-job-env-for-dut.sh
- section_end variables - section_end variables
- install/piglit/piglit-traces.sh - install/piglit/piglit-traces.sh
@ -380,7 +380,7 @@ yaml-toml-shell-py-test:
# Create a script to regenerate the CI environment when this job # Create a script to regenerate the CI environment when this job
# begins running on the remote DUT. # begins running on the remote DUT.
set +x set +x
"$CI_COMMON_SCRIPTS"/generate-env.sh > ${JOB_FOLDER}/set-job-env-vars.sh "$CI_COMMON_SCRIPTS"/export-gitlab-job-env-for-dut.sh > ${JOB_FOLDER}/set-job-env-vars.sh
echo "export SCRIPTS_DIR=./install" >> ${JOB_FOLDER}/set-job-env-vars.sh echo "export SCRIPTS_DIR=./install" >> ${JOB_FOLDER}/set-job-env-vars.sh
echo "Variables passed through:" echo "Variables passed through:"
cat ${JOB_FOLDER}/set-job-env-vars.sh cat ${JOB_FOLDER}/set-job-env-vars.sh