Add release branch and version parameters

Change-Id: Iaefae26e9d04fb6c278e971a69bbcc79c6ae56a1
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 c09616c..c835d39 100644 (file)
--- a/jjb/common/include-agl-build.sh
+++ b/jjb/common/include-agl-build.sh
@@ -30,6 +30,9 @@ export TARGETQA=""
 export TARGETIMAGE="agl-demo-platform\${TARGETQA}"
 export TARGETIMAGEnogfx="core-image-minimal"
 
+export TARGETRELEASEVERSION=""
+export TARGETRELEASEBRANCH=""
+
 # apply GERRIT_*
 if test -n "${GERRIT_PROJECT}"; then
 export TARGETPROJECT="${GERRIT_PROJECT}"
@@ -41,6 +44,16 @@ if test -n "${GERRIT_REFSPEC}"; then
 export TARGETREFSPEC="${GERRIT_REFSPEC}"
 fi
 
+if test -n "${RELEASE_VERSION}"; then
+export TARGETRELEASEVERSION="${RELEASE_VERSION}"
+fi
+
+if test -n "${RELEASE_BRANCH}"; then
+export TARGETRELEASEBRANCH="${RELEASE_BRANCH}"
+export TARGETBRANCH="${RELEASE_BRANCH}"
+export TARGETREFSPEC="refs/heads/${RELEASE_BRANCH}"
+fi
+
 if test x"" = x"${MACHINE}"; then
     export MACHINE="qemux86-64"
 fi
@@ -119,6 +132,12 @@ if test x"porter-nogfx" = x"$MACHINE"; then
     export TARGETFEATURES="${TARGETFEATURESnogfx}"
 fi
 
+if test ! x"" = x"$TARGETRELEASEVERSION"; then
+MANIFESTMOD="-m ${TARGETRELEASEBRANCH}_${TARGETRELEASEVERSION}"
+else
+MANIFESTMOD=""
+fi
+
 if $DEBUG; then
 set | grep ^TARGET || true
 set | grep ^GERRIT || true
@@ -137,7 +156,7 @@ mv repoclone repoclone$XTMP || true
 mkdir -p repoclone
 cd repoclone
 
-repo init --reference=/opt/AGL/preclone -q -b $TARGETBRANCH -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
+repo init --reference=/opt/AGL/preclone -q -b $TARGETBRANCH $MANIFESTMOD -u https://gerrit.automotivelinux.org/gerrit/AGL/AGL-repo
 
 # next: repo sync and dump manifest
 repo sync --force-sync --detach --no-clone-bundle

diff --git a/jjb/release-jjb-chinook-snapshot/include-release-jjb-chinook-snapshot-rsync.sh b/jjb/release-jjb-chinook-snapshot/include-release-jjb-chinook-snapshot-rsync.sh
index 226f9da..c76d319 100644 (file)
--- a/jjb/release-jjb-chinook-snapshot/include-release-jjb-chinook-snapshot-rsync.sh
+++ b/jjb/release-jjb-chinook-snapshot/include-release-jjb-chinook-snapshot-rsync.sh
@@ -18,7 +18,7 @@ echo "#######################################"
 echo "#######################################"
 
 export RSYNCSRC="$(pwd)/tmp/deploy/images/"
-export RSYNCDST="jenkins-slave@10.30.72.8:/srv/download/AGL/release/chinook/"
+export RSYNCDST="jenkins-slave@10.30.72.8:/srv/download/AGL/release/${RELEASE_BRANCH}/${RELEASE_VERSION}/"
 
 echo "would do rsync -avr -e \"ssh -o StrictHostKeyChecking=no\" $RSYNCSRC $RSYNCDST "
 

diff --git a/jjb/release-jjb-chinook-snapshot/release-jjb-chinook-snapshot.yaml b/jjb/release-jjb-chinook-snapshot/release-jjb-chinook-snapshot.yaml
index 95ac199..3956605 100644 (file)
--- a/jjb/release-jjb-chinook-snapshot/release-jjb-chinook-snapshot.yaml
+++ b/jjb/release-jjb-chinook-snapshot/release-jjb-chinook-snapshot.yaml
@@ -22,6 +22,14 @@
           name: GERRIT_REFSPEC
           default: refs/heads/chinook
           description: "refspec to build"
+      - string:
+          name: RELEASE_VERSION
+          default: 2.99.3
+          description: "release version number for build"
+      - string:
+          name: RELEASE_BRANCH
+          default: chinook
+          description: "release branch to build"
       - string:
           name: UPLOAD
           default: yes_or_no
@@ -51,7 +59,7 @@
     triggers:
       - gerrit-trigger-patch-submitted-silent:
             name: 'AGL/AGL-repo'
-            branch: 'refs/tags/**'
+            branch: 'refs/tags/chinook/**'
 
     wrappers:
       - agl-infra-wrappers: