mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2024-11-23 10:14:13 +08:00
d0e5203855
Trying to get arbitrary strings suitably quoted for shell, embedded in a YAML file, processed by Python templating, is like seven bad ideas all embedded into one big can of bees. Reuse the same script we use for bare-metal to generate the environment, tar that up into a per-job overlay which is added to the inter-pipeline-reusable rootfs built by the container jobs and the intra-pipeline-reusable overlay built by the build jobs. @anholt wrote a chunk of this - replacing the $ENV_VARS GitLab CI variable with a Python loop across the POSIX job environment - in !11192, but this still had YAML quoting nightmares, and was more needless duplication between LAVA and bare-metal. The diff is large and annoying, but is mostly a sed job to get ENV_VARS="FOO=bar BAZ=quux" into FOO: bar\nBAZ: quux. Signed-off-by: Daniel Stone <daniels@collabora.com> Co-authored-by: Emma Anholt <emma@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11309>
58 lines
1.9 KiB
Bash
Executable File
58 lines
1.9 KiB
Bash
Executable File
#!/bin/bash
|
|
|
|
set -e
|
|
set -o xtrace
|
|
|
|
CROSS_FILE=/cross_file-"$CROSS".txt
|
|
|
|
# Delete unused bin and includes from artifacts to save space.
|
|
rm -rf install/bin install/include
|
|
|
|
# Strip the drivers in the artifacts to cut 80% of the artifacts size.
|
|
if [ -n "$CROSS" ]; then
|
|
STRIP=`sed -n -E "s/strip\s*=\s*'(.*)'/\1/p" "$CROSS_FILE"`
|
|
if [ -z "$STRIP" ]; then
|
|
echo "Failed to find strip command in cross file"
|
|
exit 1
|
|
fi
|
|
else
|
|
STRIP="strip"
|
|
fi
|
|
if [ -z "$ARTIFACTS_DEBUG_SYMBOLS"]; then
|
|
find install -name \*.so -exec $STRIP {} \;
|
|
fi
|
|
|
|
# Test runs don't pull down the git tree, so put the dEQP helper
|
|
# script and associated bits there.
|
|
echo "$(cat VERSION) (git-$(git rev-parse HEAD | cut -b -10))" > install/VERSION
|
|
cp -Rp .gitlab-ci/bare-metal install/
|
|
cp -Rp .gitlab-ci/common install/
|
|
cp -Rp .gitlab-ci/piglit install/
|
|
cp -Rp .gitlab-ci/fossils.yml install/
|
|
cp -Rp .gitlab-ci/fossils install/
|
|
cp -Rp .gitlab-ci/fossilize-runner.sh install/
|
|
cp -Rp .gitlab-ci/deqp-runner.sh install/
|
|
cp -Rp .gitlab-ci/crosvm-runner.sh install/
|
|
cp -Rp .gitlab-ci/crosvm-init.sh install/
|
|
cp -Rp .gitlab-ci/deqp-*.txt install/
|
|
cp -Rp .gitlab-ci/report-flakes.py install/
|
|
cp -Rp .gitlab-ci/vkd3d-proton install/
|
|
find . -path \*/ci/\*.txt \
|
|
-o -path \*/ci/\*traces\*.yml \
|
|
| xargs -I '{}' cp -p '{}' install/
|
|
|
|
# Tar up the install dir so that symlinks and hardlinks aren't each
|
|
# packed separately in the zip file.
|
|
mkdir -p artifacts/
|
|
tar -cf artifacts/install.tar install
|
|
cp -Rp .gitlab-ci/common artifacts/ci-common
|
|
cp -Rp .gitlab-ci/lava artifacts/
|
|
|
|
if [ -n "$MINIO_ARTIFACT_NAME" ]; then
|
|
# Pass needed files to the test stage
|
|
MINIO_ARTIFACT_NAME="$MINIO_ARTIFACT_NAME.tar.gz"
|
|
gzip -c artifacts/install.tar > ${MINIO_ARTIFACT_NAME}
|
|
ci-fairy minio login $CI_JOB_JWT
|
|
ci-fairy minio cp ${MINIO_ARTIFACT_NAME} minio://${PIPELINE_ARTIFACTS_BASE}/${MINIO_ARTIFACT_NAME}
|
|
fi
|