From 2d2ce53f06bc5a2cec1569b05b08c43e0598980b Mon Sep 17 00:00:00 2001 From: Jan-Simon Möller Date: Tue, 3 Jan 2017 09:56:25 +0100 Subject: Add release branch and version parameters MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Change-Id: Iaefae26e9d04fb6c278e971a69bbcc79c6ae56a1 Signed-off-by: Jan-Simon Möller --- .../include-release-jjb-chinook-snapshot-rsync.sh | 2 +- .../release-jjb-chinook-snapshot.yaml | 10 +++++++++- 2 files changed, 10 insertions(+), 2 deletions(-) (limited to 'jjb/release-jjb-chinook-snapshot') 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 @@ -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: -- cgit 1.2.3-korg