diff options
author | 2016-05-11 12:09:26 -0500 | |
---|---|---|
committer | 2016-05-11 21:42:29 -0500 | |
commit | 5d1d00330488903ae810de20bfd035fde9cdc25a (patch) | |
tree | 00ccd8e7dfa549f77264ff8ad5537fe3a53b5657 | |
parent | cf7546ba0195acb070274c92268f3089e9af731d (diff) |
Changes to accomodate vpp throttle branch.
Change-Id: If3ea89cbd6970a53bad8c13900c2eb8f15a7708c
Signed-off-by: Ed Warnicke <eaw@cisco.com>
-rw-r--r-- | jjb/vpp/include-raw-vpp-maven-push.sh | 32 | ||||
-rw-r--r-- | jjb/vpp/vpp.yaml | 20 |
2 files changed, 35 insertions, 17 deletions
diff --git a/jjb/vpp/include-raw-vpp-maven-push.sh b/jjb/vpp/include-raw-vpp-maven-push.sh index 4d370942b..752b3337e 100644 --- a/jjb/vpp/include-raw-vpp-maven-push.sh +++ b/jjb/vpp/include-raw-vpp-maven-push.sh @@ -12,15 +12,27 @@ BASEURL="${NEXUSPROXY}/content/repositories/fd.io." BASEREPOID='fdio-' declare -A REPO_TARGET REPOID_TARGET=( - [ubuntu1404]="${BASEREPOID}dev" - [ubuntu1604]="${BASEREPOID}ubuntu.xenial.main" - [centos7]="${BASEREPOID}yum" + [master:ubuntu1404]="${BASEREPOID}master.ubuntu.trusty.main" + [master:ubuntu1604]="${BASEREPOID}master.ubuntu.xenial.main" + [master:centos7]="${BASEREPOID}master.centos7" + [stable/test:ubuntu1404]="${BASEREPOID}stable.test.ubuntu.trusty.main" + [stable/test:ubuntu1604]="${BASEREPOID}stable.test.ubuntu.xenial.main" + [stable/test:centos7]="${BASEREPOID}stable.test.centos7" + [stable/1606:ubuntu1404]="${BASEREPOID}stable.1606.ubuntu.trusty.main" + [stable/1606:ubuntu1604]="${BASEREPOID}stable.1606.ubuntu.xenial.main" + [stable/1606:centos7]="${BASEREPOID}stable.1606.centos7" ) declare -A REPOURL_TARGET REPOURL_TARGET=( - [ubuntu1404]="${BASEURL}dev" - [ubuntu1604]="${BASEURL}ubuntu.xenial.main" - [centos7]="${BASEURL}yum" + [master:ubuntu1404]="${BASEURL}master.ubuntu.trusty.main" + [master:ubuntu1604]="${BASEURL}master.ubuntu.xenial.main" + [master:centos7]="${BASEURL}master.centos7" + [stable/test:ubuntu1404]="${BASEURL}stable.test.ubuntu.trusty.main" + [stable/test:ubuntu1604]="${BASEURL}stable.test.ubuntu.xenial.main" + [stable/test:centos7]="${BASEURL}stable.test.centos7" + [stable/1606:ubuntu1404]="${BASEURL}stable.1606.ubuntu.trusty.main" + [stable/1606:ubuntu1604]="${BASEURL}stable.1606.ubuntu.xenial.main" + [stable/1606:centos7]="${BASEURL}stable.1606.centos7" ) function push_file () @@ -69,8 +81,8 @@ function push_jar () function push_deb () { debfile=$1 - repoId=${REPOID_TARGET[${OS}]} - url="${REPOURL_TARGET[${OS}]}" + repoId=${REPOID_TARGET[${GERRIT_BRANCH}:${OS}]} + url="${REPOURL_TARGET[${GERRIT_BRANCH}:${OS}]}" basefile=$(basename -s .deb "$debfile") artifactId=$(echo "$basefile" | cut -f 1 -d '_') @@ -82,8 +94,8 @@ function push_deb () function push_rpm () { rpmfile=$1 - repoId=${REPOID_TARGET[${OS}]} - url="${REPOURL_TARGET[${OS}]}" + repoId=${REPOID_TARGET[${GERRIT_BRANCH}:${OS}]} + url="${REPOURL_TARGET[${GERRIT_BRANCH}:${OS}]}" if grep -qE '\.s(rc\.)?rpm' <<<"$rpmfile" then diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index e9815d9de..3b25b0cd4 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -1,16 +1,22 @@ - project: name: vpp jobs: - - 'vpp-verify-{branch}-{os}' - - 'vpp-merge-{branch}-{os}' - - 'vpp-verify-image-{branch}-{os}' + - 'vpp-verify-{stream}-{os}' + - 'vpp-merge-{stream}-{os}' + - 'vpp-verify-image-{stream}-{os}' project: 'vpp' os: - ubuntu1404 - centos7 - ubuntu1604 - branch: 'master' + stream: + - master: + branch: master + - test: + branch: stable/test + - 1606: + branch: stable/1606 type: - short - long @@ -29,7 +35,7 @@ - long - job-template: - name: 'vpp-verify-{branch}-{os}' + name: 'vpp-verify-{stream}-{os}' project-type: freestyle node: 'verify-{os}' @@ -70,7 +76,7 @@ !include-raw-escape include-raw-vpp-build.sh - job-template: - name: 'vpp-verify-image-{branch}-{os}' + name: 'vpp-verify-image-{stream}-{os}' project-type: freestyle node: 'verify-image-{os}' @@ -124,7 +130,7 @@ !include-raw-escape include-raw-vpp-build.sh - job-template: - name: 'vpp-merge-{branch}-{os}' + name: 'vpp-merge-{stream}-{os}' project-type: freestyle node: 'merge-{os}' |