2d75fd1e0a
crosvm-runner.sh was using `export -p` to create an environment script
for the virtualized system, but this command will dump every declared
environment variable in the system, which includes Gitlab's CI variables
with sensitive data, such as passwords and auth tokens.
Replacing `export -p` to `generate-env.sh`, which only exports the
necessary variables for Mesa CI jobs.
Extra changes:
* Stop changing ${PWD} variable programmatically in scripts. ${PWD} is a
variable used by most prolific coreutils and bash commands, such as `cd`
and `pwd`, besides it is set by subshells [1]; changing this variable
may lead to complex situations.
As drop-in replacement for ${PWD}, use ${DEQP_BIN_DIR} to flag that
there is a special folder where dEQP should be run.
* Double quote path and array variables. See: https://github.com/koalaman/shellcheck/wiki/SC2086
* Do not export variables directly from commands output. See: https://github.com/koalaman/shellcheck/wiki/SC2155
[1]
```
$ cd /tmp
$ export PWD=test; bash -c 'echo $PWD'
/tmp
```
v2:
- Revert $DEQP_BIN_DIR quoting in crosvm-runner.sh and crosvm-init.sh
- Log all the passed variables to stdout, to help with debugging when
new variable are needed to be put in `generate-env.sh`
v3:
- Revert $DEQP_BIN_DIR quoting leftovers
Signed-off-by: Guilherme Gallo <guilherme.gallo@collabora.com>
Reviewed-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14626>
59 lines
2.0 KiB
Bash
Executable File
59 lines
2.0 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
set -ex
|
|
|
|
# This script can be called concurrently, pass arguments and env in a
|
|
# per-instance tmp dir
|
|
DEQP_TEMP_DIR=$(mktemp -d /tmp.XXXXXXXXXX)
|
|
export DEQP_TEMP_DIR
|
|
|
|
# The dEQP binary needs to run from the directory it's in
|
|
if [ -n "${1##*.sh}" ] && [ -z "${1##*"deqp"*}" ]; then
|
|
DEQP_BIN_DIR=$(dirname "$1")
|
|
export DEQP_BIN_DIR
|
|
fi
|
|
|
|
# Securely pass the current variables to the crosvm environment
|
|
CI_COMMON="$CI_PROJECT_DIR"/install/common
|
|
echo "Variables passed through:"
|
|
"${CI_COMMON}"/generate-env.sh | tee ${DEQP_TEMP_DIR}/crosvm-env.sh
|
|
|
|
CROSVM_KERNEL_ARGS="quiet console=null root=my_root rw rootfstype=virtiofs init=$CI_PROJECT_DIR/install/crosvm-init.sh ip=192.168.30.2::192.168.30.1:255.255.255.0:crosvm:eth0 -- $DEQP_TEMP_DIR"
|
|
|
|
# Set the crosvm-script as the arguments of the current script.
|
|
echo "$@" > $DEQP_TEMP_DIR/crosvm-script.sh
|
|
|
|
unset DISPLAY
|
|
unset XDG_RUNTIME_DIR
|
|
|
|
/usr/sbin/iptables-legacy -w -t nat -A POSTROUTING -o eth0 -j MASQUERADE
|
|
echo 1 > /proc/sys/net/ipv4/ip_forward
|
|
|
|
# Send output from guest to host
|
|
touch $DEQP_TEMP_DIR/stderr $DEQP_TEMP_DIR/stdout
|
|
tail -f $DEQP_TEMP_DIR/stderr >> /dev/stderr &
|
|
ERR_TAIL_PID=$!
|
|
tail -f $DEQP_TEMP_DIR/stdout >> /dev/stdout &
|
|
OUT_TAIL_PID=$!
|
|
|
|
trap "exit \$exit_code" INT TERM
|
|
trap "exit_code=\$?; kill $ERR_TAIL_PID $OUT_TAIL_PID; rm -rf $DEQP_TEMP_DIR" EXIT
|
|
|
|
# We aren't testing LLVMPipe here, so we don't need to validate NIR on the host
|
|
NIR_DEBUG="novalidate" LIBGL_ALWAYS_SOFTWARE="true" GALLIUM_DRIVER="$CROSVM_GALLIUM_DRIVER" crosvm run \
|
|
--gpu "$CROSVM_GPU_ARGS" \
|
|
-m 4096 \
|
|
-c 2 \
|
|
--disable-sandbox \
|
|
--shared-dir /:my_root:type=fs:writeback=true:timeout=60:cache=always \
|
|
--host_ip=192.168.30.1 --netmask=255.255.255.0 --mac "AA:BB:CC:00:00:12" \
|
|
-p "$CROSVM_KERNEL_ARGS" \
|
|
/lava-files/bzImage > $DEQP_TEMP_DIR/crosvm 2>&1
|
|
|
|
RET=$(cat $DEQP_TEMP_DIR/exit_code || true)
|
|
|
|
# Got no exit code from the script, show crosvm output to help with debugging
|
|
[ -n "$RET" ] || cat $DEQP_TEMP_DIR/crosvm || true
|
|
|
|
exit ${RET:-1}
|