From d2ce029d34e0ddc0d588a982312c312771fd1c75 Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Tue, 10 Sep 2019 17:54:04 +0200
Subject: Fix error in CIBT scripting and harden pipeline
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

do not fail on CIBT result evaluation.

Change-Id: I91e84cc9e30a149f8e56c218b1f97375c76c3d95
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 jjb/ci-AGL-verify/ci-platform-jjb.yaml     | 18 +++++++++---------
 jjb/common/include-agl-lava-jobs-submit.sh |  5 +++--
 2 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/jjb/ci-AGL-verify/ci-platform-jjb.yaml b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
index 804327af..52cca5eb 100644
--- a/jjb/ci-AGL-verify/ci-platform-jjb.yaml
+++ b/jjb/ci-AGL-verify/ci-platform-jjb.yaml
@@ -159,31 +159,31 @@
             - name: 'ci-platform-{project}-verify-CIBT-intel-corei7-64'
               current-parameters: true
               #abort-all-job: true
-              kill-phase-on: FAILURE
+              kill-phase-on: NEVER
             - name: 'ci-platform-{project}-verify-CIBT-raspberrypi3'
               current-parameters: true
               #abort-all-job: true
-              kill-phase-on: FAILURE
+              kill-phase-on: NEVER
             - name: 'ci-platform-{project}-verify-CIBT-dra7xx-evm'
               current-parameters: true
               #abort-all-job: true
-              kill-phase-on: FAILURE
+              kill-phase-on: NEVER
             - name: 'ci-platform-{project}-verify-CIBT-qemux86-64'
               current-parameters: true
               #abort-all-job: true
-              kill-phase-on: FAILURE
+              kill-phase-on: NEVER
             - name: 'ci-platform-{project}-verify-CIBT-qemuarm'
               current-parameters: true
               #abort-all-job: true
-              kill-phase-on: FAILURE
+              kill-phase-on: NEVER
             - name: 'ci-platform-{project}-verify-CIBT-qemuarm64'
               current-parameters: true
               #abort-all-job: true
-              kill-phase-on: FAILURE
+              kill-phase-on: NEVER
             - name: 'ci-platform-{project}-verify-CIBT-m3ulcb-nogfx'
               current-parameters: true
               #abort-all-job: true
-              kill-phase-on: FAILURE
+              kill-phase-on: NEVER
       - multijob:
           name: 'CIBT-{project}-complete'
           condition: ALWAYS
@@ -191,7 +191,7 @@
             - name: 'ci-platform-{project}-verify-CIBT-complete'
               current-parameters: true
               abort-all-job: true
-              kill-phase-on: FAILURE
+              kill-phase-on: NEVER
       - multijob:
           name: 'CIBT-{project}-finish-success'
           condition: SUCCESSFUL
@@ -199,7 +199,7 @@
             - name: 'ci-platform-{project}-verify-CIBT-finish-success'
               current-parameters: true
               abort-all-job: true
-              kill-phase-on: FAILURE
+              kill-phase-on: NEVER
     publishers:
       - trigger-parameterized-builds:
         - project:
diff --git a/jjb/common/include-agl-lava-jobs-submit.sh b/jjb/common/include-agl-lava-jobs-submit.sh
index 95976a3f..a029df14 100644
--- a/jjb/common/include-agl-lava-jobs-submit.sh
+++ b/jjb/common/include-agl-lava-jobs-submit.sh
@@ -125,10 +125,11 @@ handle_skiplist() {
 }
 
 # Analyze jobs results
-lavacli results $job_id | tee job-result
+lavacli results $job_id | tee job-result | grep -v '^\* ' | grep '\[fail\]$' > job-result.fail 
+
 # GOODJOB is equal to 0 if any test fail (and not present in a skiplist), 1 if all test are success
 GOODJOB=1
-grep -v '^\* ' | grep '\[fail\]$' > job-result.fail
+
 if [ -s job-result.fail ];then
 	handle_skiplist
 fi
-- 
cgit 1.2.3-korg