aboutsummaryrefslogtreecommitdiffstats
path: root/jjb/release-jjb-chinook-snapshot
diff options
context:
space:
mode:
authorJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-01-03 09:56:25 +0100
committerJan-Simon Möller <jsmoeller@linuxfoundation.org>2017-01-03 09:56:25 +0100
commit2d2ce53f06bc5a2cec1569b05b08c43e0598980b (patch)
treeff390abfb80ac4e893049c407d6f439658e6b049 /jjb/release-jjb-chinook-snapshot
parent23f8aac8bc0a2f0f3c90e2ab7a2f52bf2df96ae9 (diff)
Add release branch and version parameters
Change-Id: Iaefae26e9d04fb6c278e971a69bbcc79c6ae56a1 Signed-off-by: Jan-Simon Möller <jsmoeller@linuxfoundation.org>
Diffstat (limited to 'jjb/release-jjb-chinook-snapshot')
-rw-r--r--jjb/release-jjb-chinook-snapshot/include-release-jjb-chinook-snapshot-rsync.sh2
-rw-r--r--jjb/release-jjb-chinook-snapshot/release-jjb-chinook-snapshot.yaml10
2 files changed, 10 insertions, 2 deletions
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: