X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Finclude-raw-vpp-maven-push.sh;h=0cdf9bf36a857008bb251dfe0ff99eae60ff499c;hb=d6a0d4367bcef9b6ef0c22bdc1962ed076a3684c;hp=4d370942bb88fcadfd2a48f399c1b107e045176e;hpb=eb29008b68095416fa0248725711ad94378fece1;p=ci-management.git diff --git a/jjb/vpp/include-raw-vpp-maven-push.sh b/jjb/vpp/include-raw-vpp-maven-push.sh index 4d370942b..0cdf9bf36 100644 --- a/jjb/vpp/include-raw-vpp-maven-push.sh +++ b/jjb/vpp/include-raw-vpp-maven-push.sh @@ -10,18 +10,6 @@ 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 () { @@ -69,8 +57,8 @@ function push_jar () 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 '_') @@ -82,8 +70,8 @@ function push_deb () 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