Add option to disable sstate-mirror in release builds

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

diff --git a/jjb/common/include-agl-auto-conf.sh b/jjb/common/include-agl-auto-conf.sh
index 8811d3f..e4744df 100644 (file)
--- a/jjb/common/include-agl-auto-conf.sh
+++ b/jjb/common/include-agl-auto-conf.sh
@@ -11,10 +11,6 @@ if test x"" = x"${GERRIT_BRANCH}"; then
 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 = "\
 git://.*/.* ${DLHOST}/AGL/mirror/   \n \
@@ -23,6 +19,11 @@ http://.*/.* ${DLHOST}/AGL/mirror/  \n \
 https://.*/.* ${DLHOST}/AGL/mirror/ \n \
              "
 
+EOF
+             "
+if test x"YES" != x"${DISABLE_SSTATE_MIRROR}" ; then
+
+cat << EOF >> conf/auto.conf
 SSTATE_MIRRORS = " \
   file://.* ${DLHOST}/sstate-mirror/${DISTROBRANCH}/\${DEFAULTTUNE}/PATH \n \
                  "
@@ -33,3 +34,5 @@ SSTATE_MIRRORS = " \
 IMAGE_FSTYPES_remove = "ext3"
 SSTATE_DIR = "\${TOPDIR}/sstate-cache/\${MACHINE}/"
 EOF
+
+fi
\ No newline at end of file

diff --git a/jjb/release-jjb-eel-snapshot/release-jjb-eel-snapshot.yaml b/jjb/release-jjb-eel-snapshot/release-jjb-eel-snapshot.yaml
index e16ac4d..68267dc 100644 (file)
--- a/jjb/release-jjb-eel-snapshot/release-jjb-eel-snapshot.yaml
+++ b/jjb/release-jjb-eel-snapshot/release-jjb-eel-snapshot.yaml
@@ -35,6 +35,14 @@
           name: UPLOAD
           default: yes_or_no
           description: "Upload?"
+      - string:
+          name: BUILDONLY
+          default: ignore
+          description: "build only specified machine"
+      - string:
+          name: DISABLE_SSTATE_MIRROR
+          default: ignore
+          description: "Set to YES to disable sstate-mirror"
     axes:
       - axis:
           type: user-defined

diff --git a/jjb/release-jjb-flounder-snapshot/release-jjb-flounder-snapshot.yaml b/jjb/release-jjb-flounder-snapshot/release-jjb-flounder-snapshot.yaml
index 98e4658..0a42908 100644 (file)
--- a/jjb/release-jjb-flounder-snapshot/release-jjb-flounder-snapshot.yaml
+++ b/jjb/release-jjb-flounder-snapshot/release-jjb-flounder-snapshot.yaml
@@ -39,6 +39,10 @@
           name: BUILDONLY
           default: ignore
           description: "build only specified machine"
+      - string:
+          name: DISABLE_SSTATE_MIRROR
+          default: ignore
+          description: "Set to YES to disable sstate-mirror"
     axes:
       - axis:
           type: user-defined

diff --git a/jjb/release-jjb-guppy-snapshot/release-jjb-guppy-snapshot.yaml b/jjb/release-jjb-guppy-snapshot/release-jjb-guppy-snapshot.yaml
index 5686fb5..6f6d54e 100644 (file)
--- a/jjb/release-jjb-guppy-snapshot/release-jjb-guppy-snapshot.yaml
+++ b/jjb/release-jjb-guppy-snapshot/release-jjb-guppy-snapshot.yaml
@@ -39,6 +39,10 @@
           name: BUILDONLY
           default: ignore
           description: "build only specified machine"
+      - string:
+          name: DISABLE_SSTATE_MIRROR
+          default: ignore
+          description: "Set to YES to disable sstate-mirror"
     axes:
       - axis:
           type: user-defined
@@ -68,7 +72,7 @@
     triggers:
       - gerrit-trigger-patch-submitted-silent:
           name: 'AGL/AGL-repo'
-          branch: 'tags/guppy/**'
+          branch: 'regs/tags/guppy/**'
 
     wrappers:
       - agl-infra-wrappers: