ci/android: don't set HOME globally in cuttlefish-runner.sh
Having HOME defined globally could mess up other things like adb config files. Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/33499>
This commit is contained in:
committed by
Marge Bot
parent
f8fc7297cb
commit
a8f98befe3
@@ -13,7 +13,6 @@ if [ -n "$ANGLE_TAG" ]; then
|
||||
ci_tag_test_time_check "ANGLE_TAG"
|
||||
fi
|
||||
|
||||
export HOME=/cuttlefish
|
||||
export PATH=/cuttlefish/bin:$PATH
|
||||
export LD_LIBRARY_PATH=/cuttlefish/lib64:${CI_PROJECT_DIR}/install/lib:$LD_LIBRARY_PATH
|
||||
export EGL_PLATFORM=surfaceless
|
||||
@@ -40,7 +39,7 @@ function my_atexit()
|
||||
cp /cuttlefish/cuttlefish/instances/cvd-1/logs/launcher.log $RESULTS_DIR || true
|
||||
|
||||
# shellcheck disable=SC2317
|
||||
/cuttlefish/bin/stop_cvd -wait_for_launcher=10
|
||||
HOME=/cuttlefish stop_cvd -wait_for_launcher=10
|
||||
}
|
||||
|
||||
# stop cuttlefish if the script ends prematurely or is interrupted
|
||||
@@ -49,7 +48,7 @@ trap 'exit 2' HUP INT PIPE TERM
|
||||
|
||||
ulimit -S -n 32768
|
||||
|
||||
launch_cvd \
|
||||
HOME=/cuttlefish launch_cvd \
|
||||
-daemon \
|
||||
-verbosity=VERBOSE \
|
||||
-file_verbosity=VERBOSE \
|
||||
@@ -61,8 +60,8 @@ launch_cvd \
|
||||
-gpu_mode="$ANDROID_GPU_MODE" \
|
||||
-cpus=${FDO_CI_CONCURRENT:-4} \
|
||||
-memory_mb 8192 \
|
||||
-kernel_path="$HOME/bzImage" \
|
||||
-initramfs_path="$HOME/initramfs.img"
|
||||
-kernel_path="/cuttlefish/bzImage" \
|
||||
-initramfs_path="/cuttlefish/initramfs.img"
|
||||
|
||||
sleep 1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user