diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/scripts/maven_push_functions.sh | 12 | ||||
| -rw-r--r-- | jjb/vpp/include-raw-vpp-maven-push.sh | 84 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 4 |
3 files changed, 85 insertions, 15 deletions
diff --git a/jjb/scripts/maven_push_functions.sh b/jjb/scripts/maven_push_functions.sh index 5e964e076..2d6ae791f 100644 --- a/jjb/scripts/maven_push_functions.sh +++ b/jjb/scripts/maven_push_functions.sh @@ -49,8 +49,8 @@ function push_file () function push_jar () { jarfile=$1 - repoId=${2:-"${BASEREPOID}snapshot"} - url=${3:-"${BASEURL}snapshot"} + repoId="${BASEREPOID}snapshot" + url="${BASEURL}snapshot" basefile=$(basename -s .jar "$jarfile") artifactId=$(echo "$basefile" | cut -f 1 -d '-') @@ -62,8 +62,8 @@ 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 '_') @@ -75,8 +75,8 @@ function push_deb () 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 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}' |