diff options
| author |   Ed Warnicke <eaw@cisco.com> | 2016-04-21 07:54:03 -0500 |
|---|---|---|
| committer | Ed Warnicke <eaw@cisco.com> | 2016-04-21 07:54:03 -0500 |
| commit | 5817c7c0af55e9697f975186343b24acbe80a1f0 (patch) | |
| tree | f62c68038f2d6ac4bad6271541e658b53e0d56b0 /jjb/vpp | |
| parent | 1dc3a2e512f838cf65b1cf5a05b819d850aa68cf (diff) | |
Enable ubuntu1604 merge and push debs to repo
Change-Id: I1d2ec5b4ac01f000fb180f1f82b6de2a6126f9e7
Signed-off-by: Ed Warnicke <eaw@cisco.com>
Diffstat (limited to 'jjb/vpp')
| -rw-r--r-- | jjb/vpp/include-raw-vpp-maven-push.sh | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/jjb/vpp/include-raw-vpp-maven-push.sh b/jjb/vpp/include-raw-vpp-maven-push.sh index a8b03f6e9..a9a401281 100644 --- a/jjb/vpp/include-raw-vpp-maven-push.sh +++ b/jjb/vpp/include-raw-vpp-maven-push.sh @@ -10,6 +10,18 @@ MVN="${HOME}/tools/hudson.tasks.Maven_MavenInstallation/${MAVEN_SELECTOR}/bin/mv 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_file () { @@ -57,8 +69,8 @@ function push_jar () function push_deb () { debfile=$1 - repoId="${BASEREPOID}dev" - url="${BASEURL}dev" + repoId=${REPOID_TARGET[${OS}]} + url="${REPOURL_TARGET[${OS}]}dev" basefile=$(basename -s .deb "$debfile") artifactId=$(echo "$basefile" | cut -f 1 -d '_') @@ -70,8 +82,8 @@ function push_deb () function push_rpm () { rpmfile=$1 - repoId="${BASEREPOID}yum" - url="${BASEURL}yum" + repoId=${REPOID_TARGET[${OS}]} + url="${REPOURL_TARGET[${OS}]}yum" if grep -qE '\.s(rc\.)?rpm' <<<"$rpmfile" then @@ -97,6 +109,12 @@ if [ "${OS}" == "ubuntu1404" ]; then do push_deb "$i" done +elif [ "${OS}" == "ubuntu1604" ]; then + DEBS=$(find . -type f -iname '*.deb') + for i in $DEBS + do + push_deb "$i" + done elif [ "${OS}" == "centos7" ]; then # Find the files RPMS=$(find . -type f -iname '*.rpm') |