X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fscripts%2Fmaven_push_functions.sh;h=564c6ef373909f17c835c39a8f5e3f9f9ba43be0;hb=65cb65b7d8f0f65a7c73f9e1e229399480311c6c;hp=5e964e076659d92487c48fdd707ca861d90cc3ff;hpb=7d83439f84ccbcb54081e78c45cef63a5481a1c6;p=ci-management.git

diff --git a/jjb/scripts/maven_push_functions.sh b/jjb/scripts/maven_push_functions.sh
index 5e964e076..564c6ef37 100644
--- 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" ] || 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 \
@@ -49,12 +47,16 @@ function push_file ()
 function push_jar ()
 {
     jarfile=$1
-    repoId=${2:-"${BASEREPOID}snapshot"}
-    url=${3:-"${BASEURL}snapshot"}
+    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
 }
@@ -62,21 +64,23 @@ function push_jar ()
 function push_deb ()
 {
     debfile=$1
-    repoId=${2:-"fd.io.${REPO_NAME}"}
-    url=${3:-"${BASEURL}${REPO_NAME}"}
+    repoId="fd.io.${REPO_NAME}"
+    url="${BASEURL}${REPO_NAME}"
 
     basefile=$(basename -s .deb "$debfile")
     artifactId=$(echo "$basefile" | cut -f 1 -d '_')
     version=$(echo "$basefile" | cut -f 2- -d '_')
+    file_type=deb
+    classifier=deb
 
-    push_file "$debfile" "$repoId" "$url" "$version" "$artifactId" deb
+    push_file "$debfile" "$repoId" "$url" "$version" "$artifactId" "$file_type" "$classifier"
 }
 
 function push_rpm ()
 {
     rpmfile=$1
-    repoId=${2:-"fd.io.${REPO_NAME}"}
-    url=${3:-"${BASEURL}${REPO_NAME}"}
+    repoId="fd.io.${REPO_NAME}"
+    url="${BASEURL}${REPO_NAME}"
 
     if grep -qE '\.s(rc\.)?rpm' <<<"$rpmfile"
     then