Update ci loop for apps to include master and dab release

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

4 files changed, 39 insertions, 10 deletions

diff --git a/jjb/ci-apps-verify/ci-apps-jjb.yaml b/jjb/ci-apps-verify/ci-apps-jjb.yaml
index 1a9fe290..a8c68dd8 100644
--- a/jjb/ci-apps-verify/ci-apps-jjb.yaml
+++ b/jjb/ci-apps-verify/ci-apps-jjb.yaml
@@ -1,6 +1,9 @@
 ---
 - project:
     name: ci-apps-AGL
+    aglbranch:
+      - master
+      - dab
     architecture:
       - aarch64
       - x86-64
@@ -29,7 +32,7 @@
       - settings-wifi
     jobs:
       - ci-apps-{project}-verify
-      - ci-apps-{project}-verify-CIB-{architecture}
+      - ci-apps-{project}-verify-{aglbranch}-CIB-{architecture}
       - ci-apps-{project}-verify-CIB-finish-success
       - ci-apps-{project}-verify-failure
       - ci-apps-{project}-remove-artifacts
@@ -128,7 +131,7 @@
 # ci-apps-{project}-verify-CIB-{architecture}  =  build job per arch
 ################################################################################
 - job-template:
-    name: 'ci-apps-{project}-verify-CIB-{architecture}'
+    name: 'ci-apps-{project}-verify-{aglbranch}-CIB-{architecture}'
     project-type: freestyle
     concurrent: true
     node: agl-test-slave
@@ -157,6 +160,10 @@
           name: TARGETARCH
           default: '{architecture}'
           description: "Machine to build"
+      - string:
+          name: AGLBRANCH
+          default: '{aglbranch}'
+          description: "AGL release branch to use"
 
     build-discarder:
       days-to-keep: 30
@@ -171,7 +178,7 @@
 
     builders:
       - shell:
-          # including from ../common into ci-apps-{project}-verify-CIB-{architecture}
+          # including from ../common into ci-apps-{project}-verify-{aglbranch}-CIB-{architecture}
           !include-raw-escape:
           - ../common/include-apps-header.sh
           - ../common/include-apps-fetch-install-sdk.sh
diff --git a/jjb/common/include-apps-fetch-install-sdk.sh b/jjb/common/include-apps-fetch-install-sdk.sh
index b099d9a5..0dfbb474 100644
--- a/jjb/common/include-apps-fetch-install-sdk.sh
+++ b/jjb/common/include-apps-fetch-install-sdk.sh
@@ -11,8 +11,23 @@ SDKHOSTDIR="~/agl-sdk"
 ## apps-fetch-install-sdk.sh
 ################################################################################
 
-# should probably switch to release ... or multiple (release/snapshot) fwiw
+# default to master
 SDKBASEURL="https://download.automotivelinux.org/AGL/snapshots/master/latest/${TARGETSDKMACHINE}/deploy/sdk/"
+
+# should probably switch to release ... or multiple (release/snapshot) fwiw
+if test x"" = x"$AGLBRANCH"; then echo "AGLBRANCH not set, quitting" ; exit 1 ; fi
+
+if test x"master" = x"$AGLBRANCH" ; then
+  SDKBASEURL="https://download.automotivelinux.org/AGL/snapshots/master/latest/${TARGETSDKMACHINE}/deploy/sdk/"
+fi
+if test x"chinook" = x"$AGLBRANCH" ; then
+  SDKBASEURL="https://download.automotivelinux.org/AGL/release/chinook/latest/${TARGETSDKMACHINE}/deploy/sdk/"
+fi
+if test x"dab" = x"$AGLBRANCH" ; then
+  SDKBASEURL="https://download.automotivelinux.org/AGL/release/dab/latest/${TARGETSDKMACHINE}/deploy/sdk/"
+fi
+
+
 export TARGETSDKNAME=$(curl -s "$SDKBASEURL" | grep -e "crosssdk.*\.sh<" | sed -e "s#.*<a href=\"##g" -e "s#\">poky-agl.*##g")
 
 if test x"" = x"${TARGETSDKNAME}" ; then
@@ -31,7 +46,6 @@ chmod a+x ${TARGETSDKNAME}
 if test x"" = x"$(eval ls ${SDKHOSTDIR}/environment-setup* | grep "agl-" | grep ${TARGETSDKARCH} 2>/dev/null)" ; then
   bash ${TARGETSDKNAME} -d ${SDKHOSTDIR}/ -y
 fi
-#set -x 
 
 # find out the env setup script
 export TARGETSDKENVSCRIPT="$(eval ls ${SDKHOSTDIR}/environment-setup* | grep "agl-" | grep ${TARGETSDKARCH} 2>/dev/null)"
@@ -44,6 +58,4 @@ fi
 
 echo "About to source ${TARGETSDKENVSCRIPT}"
 source "${TARGETSDKENVSCRIPT}"
-#set | grep -i sysroots || true 
-#set +x
 
diff --git a/jjb/common/include-apps-header.sh b/jjb/common/include-apps-header.sh
index eb57c926..da084eda 100644
--- a/jjb/common/include-apps-header.sh
+++ b/jjb/common/include-apps-header.sh
@@ -58,6 +58,9 @@ while getopts ":b:a:p:r:dvx" opt; do
 	r)
 	    export TARGETREFSPEC="$OPTARG"
 	    ;;
+	t)
+	    export AGLBRANCH="$OPTARG"
+	    ;;
 	v)
 	    VERBOSE=true
 	    function vprint() {
@@ -79,6 +82,7 @@ while getopts ":b:a:p:r:dvx" opt; do
 	    echo "                 -- aarch64"
 	    echo "  -p <project> - project to use                     (default=AGL/AGL-repo)"
 	    echo "  -r <refspec> - refspec to use                     (default=refs/heads/master)"
+	    echo "  -t <branch>  - AGL release branch to use          (default=master , e.g. dab)"
 	    echo "  -v           - verbose"
 	    echo "  -x           - set -x"
 	    echo "--------------------------------------------------------------------------------"
diff --git a/jjb/common/include-apps-rsync-download-changeid.sh b/jjb/common/include-apps-rsync-download-changeid.sh
index 5feaeb13..8a9129a1 100644
--- a/jjb/common/include-apps-rsync-download-changeid.sh
+++ b/jjb/common/include-apps-rsync-download-changeid.sh
@@ -13,9 +13,15 @@ export RSYNCSRC=$(pwd)/UPLOAD/
 
 # construct upload folder
 #mv UPLOAD UPLOAD2 || true
-rm -rf UPLOAD/${TARGETARCH} || true
-mkdir -p UPLOAD/${TARGETARCH}
-export DEST=$(pwd)/UPLOAD/${TARGETARCH}
+if test x"" = x"${AGLBRANCH}" ; then
+  rm -rf UPLOAD/${TARGETARCH} || true
+  mkdir -p UPLOAD/${TARGETARCH}
+  export DEST=$(pwd)/UPLOAD/${TARGETARCH}
+else
+  rm -rf UPLOAD/${AGLBRANCH}/${TARGETARCH} || true
+  mkdir -p UPLOAD/${AGLBRANCH}/${TARGETARCH}
+  export DEST=$(pwd)/UPLOAD/${AGLBRANCH}/${TARGETARCH}
+fi
 
 pushd ${MYPROJECT}
 pwd