diff options
| author |   Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-01-03 09:56:25 +0100 |
|---|---|---|
| committer | Jan-Simon Möller <jsmoeller@linuxfoundation.org> | 2017-01-03 09:56:25 +0100 |
| commit | 2d2ce53f06bc5a2cec1569b05b08c43e0598980b (patch) | |
| tree | ff390abfb80ac4e893049c407d6f439658e6b049 | |
| parent | 23f8aac8bc0a2f0f3c90e2ab7a2f52bf2df96ae9 (diff) | |
Add release branch and version parameters
Change-Id: Iaefae26e9d04fb6c278e971a69bbcc79c6ae56a1
Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
3 files changed, 30 insertions, 3 deletions
diff --git a/jjb/common/include-agl-build.sh b/jjb/common/include-agl-build.sh index c09616c1..c835d397 100644 --- 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 226f9da3..c76d319c 100644 --- 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 95ac199e..39566055 100644 --- a/jjb/release-jjb-chinook-snapshot/release-jjb-chinook-snapshot.yaml +++ b/jjb/release-jjb-chinook-snapshot/release-jjb-chinook-snapshot.yaml @@ -23,6 +23,14 @@ 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 description: "Upload?" @@ -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: |