Add some echos to debug why packages aren't being pushed

[ci-management.git] / jjb / scripts / maven_push_functions.sh

diff --git a/jjb/scripts/maven_push_functions.sh b/jjb/scripts/maven_push_functions.sh
index 2d6ae79..22a22cb 100644 (file)
--- a/jjb/scripts/maven_push_functions.sh
+++ b/jjb/scripts/maven_push_functions.sh
@@ -5,13 +5,7 @@ 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-'
@@ -24,12 +18,16 @@ function push_file ()
     version=$4
     artifactId=$5
     file_type=$6
-    classifier=$7
 
-    if [ "$classifier" ]; then
+    if [ -n "$7" ]; then
         d_classifier="-Dclassifier=$7"
     fi
 
+    if [ ! -f "$push_file" ] ; then
+        echo "file for deployment does not exist: $push_file"
+        exit 1;
+    fi
+
     # Disable checks for doublequote to prevent glob / splitting
     # shellcheck disable=SC2086
     $MVN org.apache.maven.plugins:maven-deploy-plugin:deploy-file \
@@ -52,9 +50,13 @@ function push_jar ()
     repoId="${BASEREPOID}snapshot"
     url="${BASEURL}snapshot"
 
+    # examples:
+    # * jvpp-registry-16.09.jar
+    # * jvpp-16.09.jar
+
     basefile=$(basename -s .jar "$jarfile")
-    artifactId=$(echo "$basefile" | cut -f 1 -d '-')
-    version=$(echo "$basefile" | cut -f 2 -d '-')
+    artifactId=$(echo "$basefile" | rev | cut -d '-' -f 2-  | rev)
+    version=$(echo "$basefile" | rev | cut -d '-' -f 1  | rev)
 
     push_file "$jarfile" "$repoId" "$url" "${version}-SNAPSHOT" "$artifactId" jar
 }
@@ -69,7 +71,7 @@ function push_deb ()
     artifactId=$(echo "$basefile" | cut -f 1 -d '_')
     version=$(echo "$basefile" | cut -f 2- -d '_')
 
-    push_file "$debfile" "$repoId" "$url" "$version" "$artifactId" deb
+    push_file "$debfile" "$repoId" "$url" "$version" "$artifactId" deb deb
 }
 
 function push_rpm ()