ci/bare-metal: Terminate the job with an error on kernel panic.
authorEric Anholt <eric@anholt.net>
Tue, 9 Jun 2020 17:00:17 +0000 (10:00 -0700)
committerMarge Bot <eric+marge@anholt.net>
Fri, 12 Jun 2020 23:34:44 +0000 (23:34 +0000)
Otherwise, we'll time out after 60 minutes of waiting for the run to
complete.

Reviewed-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2651
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5393>

.gitlab-ci/bare-metal/cros-servo.sh
.gitlab-ci/bare-metal/fastboot.sh

index 091d24695d50c42a95c70f15aa0b95ba841b5181..3fe923125994ab45a4b97b3a2f697e4551871796 100755 (executable)
@@ -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'
index 2ed636f637cd0835749c54d6bab50fadbc5d1ae7..9a4e6f649594df96e7ddfc2ba6cf96ac1d8562c5 100755 (executable)
@@ -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