From 32143cba4d95018c9184f2e4cab0d9ac69019659 Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 9 Jun 2020 10:00:17 -0700 Subject: [PATCH] ci/bare-metal: Terminate the job with an error on kernel panic. Otherwise, we'll time out after 60 minutes of waiting for the run to complete. Reviewed-by: Christian Gmeiner Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2651 Part-of: --- .gitlab-ci/bare-metal/cros-servo.sh | 4 +++- .gitlab-ci/bare-metal/fastboot.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.gitlab-ci/bare-metal/cros-servo.sh b/.gitlab-ci/bare-metal/cros-servo.sh index 091d24695d5..3fe92312599 100755 --- a/.gitlab-ci/bare-metal/cros-servo.sh +++ b/.gitlab-ci/bare-metal/cros-servo.sh @@ -81,7 +81,9 @@ $BM/expect-output.sh serial-output.txt -f "load_archive: loading locale_en.bin" $BM/write-serial.py $BM_SERIAL `printf '\016'` # Wait for the device to complete the deqp run -$BM/expect-output.sh serial-output.txt -f "bare-metal result" +$BM/expect-output.sh serial-output.txt \ + -f "bare-metal result" \ + -e "---. end Kernel panic" # power down the CPU on the device $BM/write-serial.py $BM_SERIAL_EC 'power off' diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh index 2ed636f637c..9a4e6f64959 100755 --- a/.gitlab-ci/bare-metal/fastboot.sh +++ b/.gitlab-ci/bare-metal/fastboot.sh @@ -95,7 +95,9 @@ $BM/expect-output.sh artifacts/serial-output.txt \ fastboot boot -s $BM_FASTBOOT_SERIAL artifacts/fastboot.img # Wait for the device to complete the deqp run -$BM/expect-output.sh artifacts/serial-output.txt -f "bare-metal result" +$BM/expect-output.sh artifacts/serial-output.txt \ + -f "bare-metal result" \ + -e "---. end Kernel panic" # power down the device PATH=$BM:$PATH $BM_POWERDOWN -- 2.30.2