From 4f1e4787e247add28e63978af2abcd7ae3d5ab05 Mon Sep 17 00:00:00 2001
From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Tue, 2 Jan 2018 16:53:58 +0100
Subject: Apply new folder structure for application repository
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Change-Id: I5937215900d8310947e5a7a1e6e247abda0703b8
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
---
 jjb/common/include-apps-fetch-install-sdk.sh            | 12 ++++++------
 jjb/common/include-apps-prepare-upload-folder-merged.sh | 10 +++++++---
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/jjb/common/include-apps-fetch-install-sdk.sh b/jjb/common/include-apps-fetch-install-sdk.sh
index 639ede48..0cec864d 100644
--- a/jjb/common/include-apps-fetch-install-sdk.sh
+++ b/jjb/common/include-apps-fetch-install-sdk.sh
@@ -11,18 +11,17 @@ SDKHOSTDIR="~/agl-sdk"
 ## apps-fetch-install-sdk.sh
 ################################################################################
 
-# 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
 
+# default to release
+SDKBASEURL="https://download.automotivelinux.org/AGL/release/${AGLBRANCH}/latest/${TARGETSDKMACHINE}/deploy/sdk/"
+
+# but master uses snapshot
 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
+# special case for dab
 if test x"dab" = x"$AGLBRANCH" ; then
   if test x"dragonboard-410c" = x"$TARGETSDKMACHINE"; then
       echo "Skipping dragonboard-410c/aarch64 .... "
@@ -32,6 +31,7 @@ if test x"dab" = x"$AGLBRANCH" ; then
 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
diff --git a/jjb/common/include-apps-prepare-upload-folder-merged.sh b/jjb/common/include-apps-prepare-upload-folder-merged.sh
index 0e273bd3..222e921c 100644
--- a/jjb/common/include-apps-prepare-upload-folder-merged.sh
+++ b/jjb/common/include-apps-prepare-upload-folder-merged.sh
@@ -32,9 +32,13 @@ fi
 # construct upload folder
 #mv UPLOAD UPLOAD2 || true
 rm -rf UPLOAD/* || true
-mkdir -p UPLOAD/${MYPROJECT}/${AGLBRANCH}/changeset-${GERRIT_CHANGE_NUMBER}/${TARGETARCH}
-ln -sf changeset-${GERRIT_CHANGE_NUMBER} UPLOAD/${MYPROJECT}/${AGLBRANCH}/latest
-export DEST=$(pwd)/UPLOAD/${MYPROJECT}/${AGLBRANCH}/changeset-${GERRIT_CHANGE_NUMBER}/${TARGETARCH}
+
+PROJECTDIR="${AGLBRANCH}/${MYPROJECT}/${TARGETARCH}/"
+PROJECTPATTERN="${PROJECTDIR}/changeset-${GERRIT_CHANGE_NUMBER}"
+
+mkdir -p UPLOAD/${PROJECTPATTERN}
+ln -sf changeset-${GERRIT_CHANGE_NUMBER} UPLOAD/${PROJECTDIR}/latest
+export DEST=$(pwd)/UPLOAD/${PROJECTPATTERN}
 
 # copy the wgt to the upload folder
 pushd ${MYPROJECT}
-- 
cgit 1.2.3-korg