summaryrefslogtreecommitdiffstats
path: root/jjb/vpp
diff options
context:
space:
mode:
authorEd Warnicke <hagbard@gmail.com>2016-06-17 17:24:47 +0000
committerEd Warnicke <hagbard@gmail.com>2016-06-17 17:26:22 +0000
commit6e8f5c9323fcc2898965975005ff4a42ff0fe83c (patch)
tree697cdabc6f6bb45570baae866a61c1bb0686b1d9 /jjb/vpp
parent7d83439f84ccbcb54081e78c45cef63a5481a1c6 (diff)
Revert "Create script to automate deployment"
https://gerrit.fd.io/r/#/c/1606/ This reverts commit afd303bc155a27d1ddccfc8add7d510c731decf5. Change-Id: Ie169e3cad3433953d6f21064ec90b33d6b2dc49a Signed-off-by: Ed Warnicke <eaw@cisco.com>
Diffstat (limited to 'jjb/vpp')
-rw-r--r--jjb/vpp/include-raw-vpp-maven-push.sh84
-rw-r--r--jjb/vpp/vpp.yaml4
2 files changed, 79 insertions, 9 deletions
diff --git a/jjb/vpp/include-raw-vpp-maven-push.sh b/jjb/vpp/include-raw-vpp-maven-push.sh
index c3361b78e..91bc295b8 100644
--- a/jjb/vpp/include-raw-vpp-maven-push.sh
+++ b/jjb/vpp/include-raw-vpp-maven-push.sh
@@ -1,22 +1,94 @@
#!/bin/bash
-
-# Copyright 2015,2016 The Linux Foundation
-# 2015,2016 Cisco Systems
-
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 "*******************************************************************"
-source ../scripts/maven_push_functions.sh
-
# 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"
+GROUP_ID="io.fd.${PROJECT}"
+BASEURL="${NEXUSPROXY}/content/repositories/fd.io."
+BASEREPOID='fdio-'
+
+function push_file ()
+{
+ push_file=$1
+ repoId=$2
+ url=$3
+ version=$4
+ artifactId=$5
+ file_type=$6
+ classifier=$7
+
+ if [ "$classifier" ]; then
+ d_classifier="-Dclassifier=$7"
+ fi
+
+ # Disable checks for doublequote to prevent glob / splitting
+ # shellcheck disable=SC2086
+ $MVN org.apache.maven.plugins:maven-deploy-plugin:deploy-file \
+ -Dfile=$push_file -DrepositoryId=$repoId \
+ -Durl=$url -DgroupId=$GROUP_ID \
+ -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 ()
+{
+ jarfile=$1
+ repoId="${BASEREPOID}snapshot"
+ url="${BASEURL}snapshot"
+
+ basefile=$(basename -s .jar "$jarfile")
+ artifactId=$(echo "$basefile" | cut -f 1 -d '-')
+ version=$(echo "$basefile" | cut -f 2 -d '-')
+
+ push_file "$jarfile" "$repoId" "$url" "${version}-SNAPSHOT" "$artifactId" jar
+}
+
+function push_deb ()
+{
+ debfile=$1
+ 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
+}
+
+function push_rpm ()
+{
+ rpmfile=$1
+ repoId="fd.io.${REPO_NAME}"
+ url="${BASEURL}${REPO_NAME}"
+
+ if grep -qE '\.s(rc\.)?rpm' <<<"$rpmfile"
+ then
+ rpmrelease=$(rpm -qp --queryformat="%{release}.src" "$rpmfile")
+ else
+ rpmrelease=$(rpm -qp --queryformat="%{release}.%{arch}" "$rpmfile")
+ fi
+ 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
# Find the files
JARS=$(find . -type f -iname '*.jar')
diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml
index f75db81d7..fafd91667 100644
--- a/jjb/vpp/vpp.yaml
+++ b/jjb/vpp/vpp.yaml
@@ -198,9 +198,7 @@
settings-file: 'vpp-settings'
global-settings-file: 'global-settings'
- shell:
- !include-raw-escape:
- - ../scripts/maven_push_functions.sh
- - include-raw-vpp-maven-push.sh
+ !include-raw-escape: include-raw-vpp-maven-push.sh
- job-template:
name: 'vpp-csit-verify-virl-{stream}'