aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2019-03-23 14:12:49 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2019-03-23 14:12:49 +0100
commit50b1e72dc2475fb971afa942a1b0581e8c4f2d2c (patch)
treef782057a50ca05ab45a841fd0882f027b4b43e6d
parent06b249dc50ce7235ef60352ad07658981d15842d (diff)
Add option to disable sstate-mirror in release builds
Change-Id: I4149a9a2eee0d96acd4900f4daf250a6dde71701 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
-rw-r--r--jjb/common/include-agl-auto-conf.sh11
-rw-r--r--jjb/release-jjb-eel-snapshot/release-jjb-eel-snapshot.yaml8
-rw-r--r--jjb/release-jjb-flounder-snapshot/release-jjb-flounder-snapshot.yaml4
-rw-r--r--jjb/release-jjb-guppy-snapshot/release-jjb-guppy-snapshot.yaml6
4 files changed, 24 insertions, 5 deletions
diff --git a/jjb/common/include-agl-auto-conf.sh b/jjb/common/include-agl-auto-conf.sh
index 8811d3fd..e4744df7 100644
--- 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 e16ac4d4..68267dc6 100644
--- 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 98e46584..0a42908a 100644
--- 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 5686fb54..6f6d54e5 100644
--- 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: