Module: Mesa Branch: master Commit: 2dfc241e36865655913d0f0d961fc76f49bf2f50 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=2dfc241e36865655913d0f0d961fc76f49bf2f50
Author: Christian Gmeiner <christian.gmei...@gmail.com> Date: Sat May 9 21:49:52 2020 +0200 ci: bare-metal: make it possible to use a script for serial Makes it possible to use e.g. a ser2net script to talk to the devices. Signed-off-by: Christian Gmeiner <christian.gmei...@gmail.com> Reviewed-by: Eric Anholt <e...@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5268> --- .gitlab-ci/bare-metal/fastboot.sh | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh index 124309e8abe..572fd9dc9c4 100755 --- a/.gitlab-ci/bare-metal/fastboot.sh +++ b/.gitlab-ci/bare-metal/fastboot.sh @@ -2,9 +2,12 @@ BM=$CI_PROJECT_DIR/.gitlab-ci/bare-metal -if [ -z "$BM_SERIAL" ]; then - echo "Must set BM_SERIAL in your gitlab-runner config.toml [[runners]] environment" - echo "This is the serial device to talk to for waiting for fastboot to be ready and logging from the kernel." +if [ -z "$BM_SERIAL" -a -z "$BM_SERIAL_SCRIPT" ]; then + echo "Must set BM_SERIAL OR BM_SERIAL_SCRIPT in your gitlab-runner config.toml [[runners]] environment" + echo "BM_SERIAL:" + echo " This is the serial device to talk to for waiting for fastboot to be ready and logging from the kernel." + echo "BM_SERIAL_SCRIPT:" + echo " This is a shell script to talk to for waiting for fastboot to be ready and logging from the kernel." exit 1 fi @@ -63,7 +66,12 @@ abootimg \ rm Image.gz-dtb # Start watching serial, and power up the device. -$BM/serial-buffer.py $BM_SERIAL | tee artifacts/serial-output.txt & +if [ -n "$BM_SERIAL" ]; then + $BM/serial-buffer.py $BM_SERIAL | tee artifacts/serial-output.txt & +else + PATH=$BM:$PATH $BM_SERIAL_SCRIPT | tee artifacts/serial-output.txt & +fi + while [ ! -e artifacts/serial-output.txt ]; do sleep 1 done _______________________________________________ mesa-commit mailing list mesa-commit@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-commit
