From: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Date: Tue, 30 May 2017 05:29:13 +0000 (+0200)
Subject: SSTATE per branch + defaulttune
X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=commitdiff_plain;h=238771002532cd0ab24dbf10ad11942ca6094890;p=ci-management.git

SSTATE per branch + defaulttune

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

diff --git a/jjb/common/.include-agl-build.sh b/jjb/common/.include-agl-build.sh
index 8a27b8f4..13ecb938 100644
--- a/jjb/common/.include-agl-build.sh
+++ b/jjb/common/.include-agl-build.sh
@@ -210,7 +210,7 @@ file://.* file:///opt/AGL/sstate-mirror/\${MACHINE}/PATH    \n \
 file://.* ${DLHOST}/sstate-mirror/\${MACHINE}/PATH \n \
                  "
 
-SSTATE_DIR = "\${TOPDIR}/sstate-cache/\${MACHINE}/"
+SSTATE_DIR = "\${TOPDIR}/sstate-cache/${GERRIT_BRANCH}/\${DEFAULTTUNE}/"
 EOF
 
 cat conf/auto.conf
diff --git a/jjb/common/include-agl-auto-conf.sh b/jjb/common/include-agl-auto-conf.sh
index a097d5ae..8811d3fd 100644
--- a/jjb/common/include-agl-auto-conf.sh
+++ b/jjb/common/include-agl-auto-conf.sh
@@ -6,6 +6,14 @@
 ################################################################################
 
 export DLHOST="http://download.automotivelinux.org/"
+if test x"" = x"${GERRIT_BRANCH}"; then
+    export DISTROBRANCH="master"
+else
+    export DISTROBRANCH="${GERRIT_BRANCH}"
+fi
+#if test ! x"" = x"${RELEASE_BRANCH}"; then
+#    export DISTROBRANCH="$RELEASE_BRANCH"
+#fi
 #limit parallel number of bitbake jobs and parallel jobs in make
 cat << EOF >> conf/auto.conf
 PREMIRRORS = "\
@@ -16,7 +24,7 @@ https://.*/.* ${DLHOST}/AGL/mirror/ \n \
              "
 
 SSTATE_MIRRORS = " \
-  file://.* ${DLHOST}/sstate-mirror/\${DEFAULTTUNE}/PATH \n \
+  file://.* ${DLHOST}/sstate-mirror/${DISTROBRANCH}/\${DEFAULTTUNE}/PATH \n \
                  "
 #
 #file://.* file:///opt/AGL/sstate-mirror/\${MACHINE}/PATH    \n 
diff --git a/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh b/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh
index 8a27b8f4..091aaaa7 100644
--- a/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh
+++ b/jjb/release-jjb-blowfish-snapshot/include-release-jjb-blowfish-snapshot-build.sh
@@ -207,7 +207,7 @@ https://.*/.* ${DLHOST}/AGL/mirror/ \n \
 
 SSTATE_MIRRORS = "\
 file://.* file:///opt/AGL/sstate-mirror/\${MACHINE}/PATH    \n \
-file://.* ${DLHOST}/sstate-mirror/\${MACHINE}/PATH \n \
+file://.* ${DLHOST}/sstate-mirror/${GERRIT_BRANCH}/\${DEFAULTTUNE}/PATH \n \
                  "
 
 SSTATE_DIR = "\${TOPDIR}/sstate-cache/\${MACHINE}/"