ci/bare-metal: Reword the final output of the init script on the board.

I'm going to be adding tracie, which isn't deqp.

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

diff --git a/.gitlab-ci/bare-metal/cros-servo.sh b/.gitlab-ci/bare-metal/cros-servo.sh
index 0b978df73a36f8c5bbbf5d0541300555d3c25b64..43982e07f9600cea3c5eebe1536ce732a5c55014 100755 (executable)
--- a/.gitlab-ci/bare-metal/cros-servo.sh
+++ b/.gitlab-ci/bare-metal/cros-servo.sh
@@ -76,7 +76,7 @@ $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 "DEQP RESULT"
+$BM/expect-output.sh serial-output.txt -f "bare-metal result"
 
 # power down the CPU on the device
 $BM/write-serial.py $BM_SERIAL_EC 'power off'
@@ -90,7 +90,7 @@ mkdir -p results
 cp -Rp /nfs/results/. results/
 
 set +e
-if grep -q "DEQP RESULT: pass" serial-output.txt; then
+if grep -q "bare-metal result: pass" serial-output.txt; then
    exit 0
 else
    exit 1

diff --git a/.gitlab-ci/bare-metal/fastboot.sh b/.gitlab-ci/bare-metal/fastboot.sh
index 72d38b4d718da400e08aaebbd6bdcdbbb9b39d2a..2b1edbac45b78c663ccbd8f4975a401d47058631 100755 (executable)
--- a/.gitlab-ci/bare-metal/fastboot.sh
+++ b/.gitlab-ci/bare-metal/fastboot.sh
@@ -92,13 +92,13 @@ $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 "DEQP RESULT"
+$BM/expect-output.sh artifacts/serial-output.txt -f "bare-metal result"
 
 # power down the device
 PATH=$BM:$PATH $BM_POWERDOWN
 
 set +e
-if grep -q "DEQP RESULT: pass" artifacts/serial-output.txt; then
+if grep -q "bare-metal result: pass" artifacts/serial-output.txt; then
    exit 0
 else
    exit 1

diff --git a/.gitlab-ci/bare-metal/init.sh b/.gitlab-ci/bare-metal/init.sh
index 2dc944da97404d1b3e0b723d47506dcc0ff125d8..93de85c9f283a0266212d477d76f077bc457b267 100644 (file)
--- a/.gitlab-ci/bare-metal/init.sh
+++ b/.gitlab-ci/bare-metal/init.sh
@@ -18,9 +18,9 @@ if [ -e /install/deqp-expected-fails.txt ]; then
 fi
 
 if sh /deqp/deqp-runner.sh; then
-    echo "DEQP RESULT: pass"
+    echo "bare-metal result: pass"
 else
-    echo "DEQP RESULT: fail"
+    echo "bare-metal result: fail"
 fi
 
 # Wait until the job would have timed out anyway, so we don't spew a "init