Change-Id: I70cd178f52480bcab2bd84b7bdb967f1799acdbd
Signed-off-by: Ed Warnicke <eaw@cisco.com>
name: MAVEN_SELECTOR
default: '{maven}'
description: 'Maven selector to be used by shell scripts'
name: MAVEN_SELECTOR
default: '{maven}'
description: 'Maven selector to be used by shell scripts'
+- parameter:
+ name: repo-name-parameter
+ parameters:
+ - string:
+ name: REPO_NAME
+ default: '{repo-name}'
+ description: 'Name of repo to which to publish packaging'
GROUP_ID="io.fd.${PROJECT}"
BASEURL="${NEXUSPROXY}/content/repositories/fd.io."
BASEREPOID='fdio-'
GROUP_ID="io.fd.${PROJECT}"
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"
-)
-declare -A REPOURL_TARGET
-REPOURL_TARGET=(
- [ubuntu1404]="${BASEURL}dev"
- [ubuntu1604]="${BASEURL}ubuntu.xenial.main"
- [centos7]="${BASEURL}yum"
-)
function push_deb ()
{
debfile=$1
function push_deb ()
{
debfile=$1
- repoId=${REPOID_TARGET[${OS}]}
- url="${REPOURL_TARGET[${OS}]}"
+ repoId=${REPO_NAME}
+ url="${BASEURL}${REPO_NAME}"
basefile=$(basename -s .deb "$debfile")
artifactId=$(echo "$basefile" | cut -f 1 -d '_')
basefile=$(basename -s .deb "$debfile")
artifactId=$(echo "$basefile" | cut -f 1 -d '_')
function push_rpm ()
{
rpmfile=$1
function push_rpm ()
{
rpmfile=$1
- repoId=${REPOID_TARGET[${OS}]}
- url="${REPOURL_TARGET[${OS}]}"
+ repoId=${REPO_NAME}
+ url="${BASEURL}${REPO_NAME}"
if grep -qE '\.s(rc\.)?rpm' <<<"$rpmfile"
then
if grep -qE '\.s(rc\.)?rpm' <<<"$rpmfile"
then
- project:
name: vpp
jobs:
- 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}'
- - ubuntu1404
- - centos7
- - ubuntu1604
- branch: 'master'
+ - ubuntu1404:
+ repo-os-part: 'ubuntu.trusty.main'
+ - ubuntu1604:
+ repo-os-part: 'ubuntu.xenial.main'
+ - centos7:
+ repo-os-part: 'centos7'
+ stream:
+ - master:
+ branch: 'master'
+ repo-stream-part: 'master'
+ - test:
+ branch: 'stable/test'
+ repo-stream-part: 'stable.test'
+ - '1606':
+ branch: 'stable/1606'
+ repo-stream-part: 'stable.1606'
- project:
name: vpp-misc
jobs:
- project:
name: vpp-misc
jobs:
- - 'vpp-csit-verify-virl'
- - 'vpp-csit-verify-hw-perf-{type}'
+ - 'vpp-csit-verify-virl-{stream}'
+ - 'vpp-csit-verify-hw-perf-{stream}-{type}'
+ stream:
+ - master:
+ branch: 'master'
+ repo-stream-part: 'master'
+ - test:
+ branch: 'stable/test'
+ repo-stream-part: 'stable.test'
+ - '1606':
+ branch: 'stable/1606'
+ repo-stream-part: 'stable.1606'
os: ubuntu1404
type:
- all
os: ubuntu1404
type:
- all
- name: 'vpp-verify-{branch}-{os}'
+ name: 'vpp-verify-{stream}-{os}'
project-type: freestyle
node: 'verify-{os}'
project-type: freestyle
node: 'verify-{os}'
!include-raw-escape include-raw-vpp-build.sh
- job-template:
!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}'
project-type: freestyle
node: 'verify-image-{os}'
!include-raw-escape include-raw-vpp-build.sh
- job-template:
!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}'
project-type: freestyle
node: 'merge-{os}'
os: '{os}'
- maven-project-parameter:
maven: '{mvn33}'
os: '{os}'
- maven-project-parameter:
maven: '{mvn33}'
+ - repo-name-parameter:
+ repo-name: '{repo-stream-part}.{repo-os-part}'
scm:
- gerrit-trigger-scm:
scm:
- gerrit-trigger-scm:
!include-raw-escape include-raw-vpp-maven-push.sh
- job-template:
!include-raw-escape include-raw-vpp-maven-push.sh
- job-template:
- name: 'vpp-csit-verify-virl'
+ name: 'vpp-csit-verify-virl-{stream}'
project-type: freestyle
node: 'verify-{os}'
project-type: freestyle
node: 'verify-{os}'
output-path: 'csit'
- job-template:
output-path: 'csit'
- job-template:
- name: 'vpp-csit-verify-hw-perf-{type}'
+ name: 'vpp-csit-verify-hw-perf-{stream}-{type}'
project-type: freestyle
node: 'verify-{os}'
project-type: freestyle
node: 'verify-{os}'