canonical-hw-cert team mailing list archive

[Michał Sawicz <mp+441185@xxxxxxxxxxxxxxxxxx>]

Michał Sawicz has proposed merging hwcert-jenkins-jobs:fix-mir-test-status into hwcert-jenkins-jobs:master.

Requested reviews:
  hwcert-jenkins (hwcert-jenkins)

For more details, see:
https://code.launchpad.net/~hwcert-jenkins/hwcert-jenkins-jobs/+git/hwcert-jenkins-jobs/+merge/441185

This was ignored previously, but now the test result is the jenkins exit code.
-- 
Your team hwcert-jenkins is requested to review the proposed merge of hwcert-jenkins-jobs:fix-mir-test-status into hwcert-jenkins-jobs:master.

diff --git a/jobs/mir/run-mir-track.sh b/jobs/mir/run-mir-track.sh
index 888c260..6814dc6 100644
--- a/jobs/mir/run-mir-track.sh
+++ b/jobs/mir/run-mir-track.sh
@@ -206,7 +206,7 @@ echo "$JOB_ID" > JOB_ID
 testflinger poll $JOB_ID
 
 TEST_STATUS=$(testflinger results $JOB_ID |jq -r .test_status)
-[ -n $TEST_STATUS ] && TEST_STATUS=1
+[ "$TEST_STATUS" -eq 0 ] || TEST_STATUS=1
 
 rm -rf artifacts*
 #retry getting the artifacts after a delay if it fails
diff --git a/jobs/mir/run-mir.sh b/jobs/mir/run-mir.sh
index c6d3d44..5680b1f 100644
--- a/jobs/mir/run-mir.sh
+++ b/jobs/mir/run-mir.sh
@@ -179,7 +179,7 @@ echo "$JOB_ID" > JOB_ID
 testflinger poll $JOB_ID
 
 TEST_STATUS=$(testflinger results $JOB_ID |jq -r .test_status)
-[ -n $TEST_STATUS ] && TEST_STATUS=1
+[ "$TEST_STATUS" -eq 0 ] || TEST_STATUS=1
 
 rm -rf artifacts*
 #retry getting the artifacts after a delay if it fails