From: Corentin LABBE <clabbe@baylibre.com>
Date: Wed, 11 Sep 2019 07:58:58 +0000 (+0200)
Subject: SPEC-2703: Fix remaining problems in skiplist
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F81%2F22381%2F2;p=ci-management.git

SPEC-2703: Fix remaining problems in skiplist

This patch fix the following problems:
- {{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}}: bad substitution
   A copy paste from jenkins commands, but I forgot to remove the double {}

- missing grep -v '\*', removed by ec3e1dc57d7a6a454f9ed1f0210b07b8270a1fbb ("Follow up fix")

- for apps, no dedicated skipdir as asked in SPEC-2703

Change-Id: I8dfdc6ff4d03fc946e0b8ad35f092e217afd685b
Bug-AGL: SPEC-2703:
Signed-off-by: Corentin LABBE <clabbe@baylibre.com>
---

diff --git a/jjb/common/include-agl-lava-jobs-submit.sh b/jjb/common/include-agl-lava-jobs-submit.sh
index b5d6e7f5..82482130 100644
--- a/jjb/common/include-agl-lava-jobs-submit.sh
+++ b/jjb/common/include-agl-lava-jobs-submit.sh
@@ -84,7 +84,7 @@ handle_skiplist() {
 			echo "ERROR: fail to get $GERRIT_PROJECT"
 			return 1
 		fi
-		SKIPDIR=${GERRIT_PROJECT}/skiplists/
+		SKIPDIR=${GERRIT_PROJECT}/
 		SKIPFILE=.aglci
 		CK_REPO_NAME="${GERRIT_PROJECT}"
 	fi
@@ -125,10 +125,11 @@ handle_skiplist() {
 }
 
 # Analyze jobs results
-( lavacli results $job_id | tee job-result | grep '\[fail\]$' > job-result.fail ) || true
+lavacli results $job_id | tee job-result
 
 # GOODJOB is equal to 0 if any test fail (and not present in a skiplist), 1 if all test are success
 GOODJOB=1
+grep '\[fail\]$' job-result > job-result.fail || true
 
 if [ -s job-result.fail ];then
 	handle_skiplist
@@ -136,10 +137,10 @@ fi
 
 if [ $GOODJOB -eq 0 ];then
 	# send -1
-	ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-boot-test=-1 -n NONE --message='CI-Image-Boot-Test\ fail' || true
+	ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${GERRIT_CHANGE_NUMBER},${GERRIT_PATCHSET_NUMBER} --verified +1 --label ci-image-boot-test=-1 -n NONE --message='CI-Image-Boot-Test\ fail' || true
 else
 	# send +1
-	ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${{GERRIT_CHANGE_NUMBER}},${{GERRIT_PATCHSET_NUMBER}} --verified +1 --label ci-image-boot-test=+1 -n NONE --message='CI-Image-Boot-Test\ success' || true
+	ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${GERRIT_CHANGE_NUMBER},${GERRIT_PATCHSET_NUMBER} --verified +1 --label ci-image-boot-test=+1 -n NONE --message='CI-Image-Boot-Test\ success' || true
 fi
 
 # after one successful submit, we're done