SPEC-2703: Permit to have a per-machine skiplist

The service weston does not start on qemu/qemuarm64.
for having this service check skipped only for thoses two machine, we
need to have a per-machine skiplist.

In the process, we add the possibiity to have a per GERRIT_PROJECT
skiplist.
Furthermore, I "migrate" the skiplist for apps in a skiplists directory.

Change-Id: I989b2bdf2463272ee1f407a933be49a2f4219d5f
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 84a785e..95976a3 100644 (file)
--- a/jjb/common/include-agl-lava-jobs-submit.sh
+++ b/jjb/common/include-agl-lava-jobs-submit.sh
@@ -66,6 +66,7 @@ echo "#### End: Output from LAVA job $job_id ####"
 echo "####"
 
 handle_skiplist() {
+       SKIPLIST=skiplist
        # detect job type (apps vs non-apps) and get skiplist
        echo $JOB_NAME | grep -q 'ci-platform'
        if [ $? -eq 0 ];then
@@ -74,7 +75,8 @@ handle_skiplist() {
                        echo "ERROR: fail to get qa-testdefinitions"
                        return 1
                fi
-               SKIPLIST=qa-testdefinitions/skiplists/common
+               SKIPDIR=qa-testdefinitions/skiplists/
+               SKIPFILE=common
                CK_REPO_NAME="qa-testdefinitions"
        else
                git clone https://${GERRIT_HOST}/gerrit/${GERRIT_PROJECT}.git
@@ -82,9 +84,17 @@ handle_skiplist() {
                        echo "ERROR: fail to get $GERRIT_PROJECT"
                        return 1
                fi
-               SKIPLIST=${GERRIT_PROJECT}/.aglci
+               SKIPDIR=${GERRIT_PROJECT}/skiplists/
+               SKIPFILE=.aglci
                CK_REPO_NAME="${GERRIT_PROJECT}"
        fi
+       for skipfile in $SKIPFILE $MACHINE ${GERRIT_PROJECT}
+       do
+               if [ -e $SKIPDIR/$skipfile ];then
+                       echo "DEBUG: SKIPLIST: Found $SKIPDIR/$skipfile"
+                       cat $SKIPDIR/$skipfile >> $SKIPLIST
+               fi
+       done
 
        if [ -e "$SKIPLIST" ];then
                echo "DEBUG: $SKIPLIST does not exists"