Merge "Turn off archiving for vpp verify and merge job"

[ci-management.git] / jjb / vpp / include-raw-vpp-maven-push.sh

diff --git a/jjb/vpp/include-raw-vpp-maven-push.sh b/jjb/vpp/include-raw-vpp-maven-push.sh
index f03cc29..aea6067 100644 (file)
--- a/jjb/vpp/include-raw-vpp-maven-push.sh
+++ b/jjb/vpp/include-raw-vpp-maven-push.sh
@@ -7,9 +7,9 @@ if [ -z "${MAVEN_SELECTOR}" ]; then
 fi
 
 MVN="${HOME}/tools/hudson.tasks.Maven_MavenInstallation/${MAVEN_SELECTOR}/bin/mvn"
-GROUP_ID="info.projectrotterdam.${PROJECT}"
-BASEURL="${NEXUSPROXY}/content/repositories/rotterdam."
-BASEREPOID='rotterdam-'
+GROUP_ID="io.fd.${PROJECT}"
+BASEURL="${NEXUSPROXY}/content/repositories/fd.io."
+BASEREPOID='fdio-'
 
 # find the files
 JARS=$(find . -type f -iname '*.jar')
@@ -37,6 +37,12 @@ function push_file ()
         -Dversion=$version -DartifactId=$artifactId \
         -Dtype=$file_type $d_classifier\
         -gs $GLOBAL_SETTINGS_FILE -s $SETTINGS_FILE
+
+    # make sure the script bombs if we fail an upload
+    if [ "$?" != '0' ]; then
+        echo "ERROR: There was an error with the upload"
+        exit 1
+    fi
 }
 
 function push_jar ()
@@ -55,8 +61,8 @@ function push_jar ()
 function push_deb ()
 {
     debfile=$1
-    repoId="${BASEREPOID}release"
-    url="${BASEURL}release"
+    repoId="${BASEREPOID}dev"
+    url="${BASEURL}dev"
 
     basefile=$(basename -s .deb "$debfile")
     artifactId=$(echo "$basefile" | cut -f 1 -d '_')