Update application job messaging and jellyfish branch support

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

diff --git a/jjb/common/include-agl-lava-jobs-submit.sh b/jjb/common/include-agl-lava-jobs-submit.sh
index b7c393d..08b2f4e 100644 (file)
--- a/jjb/common/include-agl-lava-jobs-submit.sh
+++ b/jjb/common/include-agl-lava-jobs-submit.sh
@@ -54,7 +54,7 @@ EOF
 sed -i -e "s/ /\\\ /g" .msg
 #### echo back to gerrit
 #set -x
-eval ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${GERRIT_CHANGE_NUMBER},${GERRIT_PATCHSET_NUMBER} -n NONE --message='"$(cat .msg)"'  || true
+#eval ssh -o "UserKnownHostsFile=/dev/null" -o "StrictHostKeyChecking=no" -p 29418 agl-jobbuilder@gerrit.automotivelinux.org gerrit review ${GERRIT_CHANGE_NUMBER},${GERRIT_PATCHSET_NUMBER} -n NONE --message='"$(cat .msg)"'  || true
 #set +x
 
 
@@ -164,12 +164,17 @@ if [ -s job-result.fail ];then
 fi
 set -x
 LINES_PERCENT=$(grep LINES_PERCENT= $JOB_LOG | sed -e 's#LINES_PERCENT=##g' | head -1)
-BRANCHES_PERCENT=$(grep BRANCHES_PERCENT= $JOB_LOG | sed -e 's#LINES_PERCENT=##g' | head -1)
+BRANCHES_PERCENT=$(grep BRANCHES_PERCENT= $JOB_LOG | sed -e 's#BRANCHES_PERCENT=##g' | head -1)
 
+if [ -n $LINES_PERCENT -a -n $BRANCHES_PERCENT ] ; then
 MSG_FAIL="CI-Image-Boot-Test fail on ${MACHINE}. Coverage: Lines ${LINES_PERCENT:-0}% , Branches ${BRANCHES_PERCENT:-0}%
 ${JOB_URL}"
 MSG_SUCCESS="CI-Image-Boot-Test success on ${MACHINE}. Coverage: Lines ${LINES_PERCENT:-0}% , Branches ${BRANCHES_PERCENT:-0}%
 ${JOB_URL}"
+else
+MSG_FAIL="CI-Image-Boot-Test fail on ${MACHINE}. ${JOB_URL}"
+MSG_SUCCESS="CI-Image-Boot-Test success on ${MACHINE}. ${JOB_URL}"
+fi
 
 MSG_BUILD_LOG="${BUILD_URL}consoleFull"
 MSG_JOBFAIL="Failed jobs:

diff --git a/jjb/common/include-apps-header.sh b/jjb/common/include-apps-header.sh
index bc147a9..8919f3c 100644 (file)
--- a/jjb/common/include-apps-header.sh
+++ b/jjb/common/include-apps-header.sh
@@ -109,7 +109,7 @@ case "$TARGETARCH" in
        x86-64)
            export TARGETSDKARCH="corei7-64"
            # starting with master, we use qemu for the SDK.
-           if test x"master" = x"$AGLBRANCH" ; then
+           if test x"master" = x"$AGLBRANCH" -o x"jellyfish" = x"${AGLBRANCH}" ; then
                export TARGETSDKMACHINE="qemux86-64"
            else
                export TARGETSDKMACHINE="intel-corei7-64"