From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Mon, 8 Jul 2019 17:00:50 +0000 (+0200)
Subject: Also react on lava jobs that were canceled in jenkins
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=719bb9fc8fab4e9e90042a5c889476fdb16c355f;p=ci-management.git

Also react on lava jobs that were canceled in jenkins

This is needed to avoid jenkins polling until the timeout when a job
was aborted.

Change-Id: Ibcf0fffaeaac86a1198e4f0411e784ff74ab9f5b
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---

diff --git a/jjb/common/include-agl-lava-jobs-submit.sh b/jjb/common/include-agl-lava-jobs-submit.sh
index 5ddb14fd..46172751 100644
--- a/jjb/common/include-agl-lava-jobs-submit.sh
+++ b/jjb/common/include-agl-lava-jobs-submit.sh
@@ -63,6 +63,11 @@ for i in $(seq 1 $JOB_TIMEOUT); do
 		continue
     fi
     state=$(grep ^state: $JOB_STATUS| cut -d' ' -f2)
+    if [ $state == "Canceled" ]; then
+		status=$(grep ^health: $JOB_STATUS| cut -d' ' -f2)
+		echo "LAVA job $job_id completed with status: $status"
+		break
+    fi
     if [ $state == "Finished" ]; then
 		status=$(grep ^health: $JOB_STATUS| cut -d' ' -f2)
 		echo "LAVA job $job_id completed with status: $status"