X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fvpp%2Finclude-raw-vpp-maven-push.sh;h=0e9c33420490b7dc96a7c3bd03217030d9a24135;hb=a2bc22aacea71d696052bf0018218f72d740db53;hp=752b3337eed712900b77bd9ec98e821ec518e8ed;hpb=5d1d00330488903ae810de20bfd035fde9cdc25a;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 752b3337e..0e9c33420 100644
--- a/jjb/vpp/include-raw-vpp-maven-push.sh
+++ b/jjb/vpp/include-raw-vpp-maven-push.sh
@@ -1,39 +1,14 @@
 #!/bin/bash
+set -xe -o pipefail
+echo "*******************************************************************"
+echo "* STARTING PUSH OF PACKAGES TO REPOS"
+echo "* NOTHING THAT HAPPENS BELOW THIS POINT IS RELATED TO BUILD FAILURE"
+echo "*******************************************************************"
 
-# Determine the path to maven
-if [ -z "${MAVEN_SELECTOR}" ]; then
-    echo "ERROR: No Maven install detected!"
-    exit 1
-fi
-
-MVN="${HOME}/tools/hudson.tasks.Maven_MavenInstallation/${MAVEN_SELECTOR}/bin/mvn"
+MVN="/opt/apache/maven/bin/mvn"
 GROUP_ID="io.fd.${PROJECT}"
 BASEURL="${NEXUSPROXY}/content/repositories/fd.io."
 BASEREPOID='fdio-'
-declare -A REPO_TARGET
-REPOID_TARGET=(
-    [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=(
-    [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 ()
 {
@@ -81,8 +56,8 @@ function push_jar ()
 function push_deb ()
 {
     debfile=$1
-    repoId=${REPOID_TARGET[${GERRIT_BRANCH}:${OS}]}
-    url="${REPOURL_TARGET[${GERRIT_BRANCH}:${OS}]}"
+    repoId="fd.io.${REPO_NAME}"
+    url="${BASEURL}${REPO_NAME}"
 
     basefile=$(basename -s .deb "$debfile")
     artifactId=$(echo "$basefile" | cut -f 1 -d '_')
@@ -94,8 +69,8 @@ function push_deb ()
 function push_rpm ()
 {
     rpmfile=$1
-    repoId=${REPOID_TARGET[${GERRIT_BRANCH}:${OS}]}
-    url="${REPOURL_TARGET[${GERRIT_BRANCH}:${OS}]}"
+    repoId="fd.io.${REPO_NAME}"
+    url="${BASEURL}${REPO_NAME}"
 
     if grep -qE '\.s(rc\.)?rpm' <<<"$rpmfile"
     then