Configuring minions as single use

[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 dc75e90..ce07fee 100644 (file)
--- a/jjb/vpp/include-raw-vpp-maven-push.sh
+++ b/jjb/vpp/include-raw-vpp-maven-push.sh
@@ -1,12 +1,11 @@
 #!/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-'
@@ -48,8 +47,8 @@ function push_jar ()
     url="${BASEURL}snapshot"
 
     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
 }
@@ -57,33 +56,31 @@ function push_jar ()
 function push_deb ()
 {
     debfile=$1
-    repoId="${BASEREPOID}dev"
-    url="${BASEURL}dev"
+    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 '_')
 
-    push_file "$debfile" "$repoId" "$url" "$version" "$artifactId" deb
+    push_file "$debfile" "$repoId" "$url" "$version" "$artifactId" deb deb
 }
 
 function push_rpm ()
 {
     rpmfile=$1
-    repoId="${BASEREPOID}yum"
-    url="${BASEURL}yum"
+    repoId="fd.io.${REPO_NAME}"
+    url="${BASEURL}${REPO_NAME}"
 
-    if grep -q srpm <<<"$rpmfile"
+    if grep -qE '\.s(rc\.)?rpm' <<<"$rpmfile"
     then
-        rpmtype=srpm
-        basefile=$(basename -s .srpm "$rpmfile")
+        rpmrelease=$(rpm -qp --queryformat="%{release}.src" "$rpmfile")
     else
-        rpmtype=rpm
-        basefile=$(basename -s .rpm "$rpmfile")
+        rpmrelease=$(rpm -qp --queryformat="%{release}.%{arch}" "$rpmfile")
     fi
-    artifactId=$(echo "$basefile" | cut -f 1 -d '_')
-    version=$(echo "$basefile" | cut -f 2- -d '_')
-    push_file "$rpmfile" "$repoId" "$url" "$version" "$artifactId" "$rpmtype"
+    artifactId=$(rpm -qp --queryformat="%{name}" "$rpmfile")
+    version=$(rpm -qp --queryformat="%{version}" "$rpmfile")
+    push_file "$rpmfile" "$repoId" "$url" "${version}-${rpmrelease}" "$artifactId" rpm
 }
 
 if [ "${OS}" == "ubuntu1404" ]; then
@@ -95,6 +92,12 @@ if [ "${OS}" == "ubuntu1404" ]; then
         push_jar "$i"
     done
 
+    for i in $DEBS
+    do
+        push_deb "$i"
+    done
+elif [ "${OS}" == "ubuntu1604" ]; then
+    DEBS=$(find . -type f -iname '*.deb')
     for i in $DEBS
     do
         push_deb "$i"
@@ -103,7 +106,8 @@ elif [ "${OS}" == "centos7" ]; then
     # Find the files
     RPMS=$(find . -type f -iname '*.rpm')
     SRPMS=$(find . -type f -iname '*.srpm')
-    for i in $RPMS $SRPMS
+    SRCRPMS=$(find . -type f -name '*.src.rpm')
+    for i in $RPMS $SRPMS $SRCRPMS
     do
         push_rpm "$i"
     done