X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-upload-distribution.sh;h=354401b1411dd3ab2ccf268322e2caf6a2afdb19;hb=02b30d17c5a18771cc75c50c80768cdc1ee5c6c6;hp=39cdbeca55cd1f1a9bf5ebf0810f3086a42cf8ca;hpb=1cf1ab953155b9f0abac9607e3608f736f55120f;p=releng%2Fbuilder.git diff --git a/jjb/integration/integration-upload-distribution.sh b/jjb/integration/integration-upload-distribution.sh index 39cdbeca5..354401b14 100644 --- a/jjb/integration/integration-upload-distribution.sh +++ b/jjb/integration/integration-upload-distribution.sh @@ -2,20 +2,21 @@ set -xeu -o pipefail BUNDLE_VERSION=$(xpath "${BUNDLE_POM}" '/project/version/text()' 2> /dev/null) -BUNDLE="${KARAF_ARTIFACT}-${BUNDLE_VERSION}.zip" -BUNDLE_FILEPATH="/tmp/r/org/opendaylight/integration/${KARAF_ARTIFACT}/${BUNDLE_VERSION}/${BUNDLE}" -ls -l "${BUNDLE_FILEPATH}" +BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLE_VERSION}" +BUNDLE="${BUNDLEFOLDER}.zip" +BUNDLE_PATH="/tmp/r/org/opendaylight/integration/${KARAF_ARTIFACT}/${BUNDLE_VERSION}/${BUNDLE}" +ls -l "${BUNDLE_PATH}" LOG_FILE='integration-upload-distribution.log' echo "Uploading distribution to Nexus..." "$MVN" deploy:deploy-file \ --log-file ${LOG_FILE} \ --global-settings "$GLOBAL_SETTINGS_FILE" \ --settings "$SETTINGS_FILE" \ - -Dfile="${BUNDLE_FILEPATH}" \ + -Dfile="${BUNDLE_PATH}" \ -DrepositoryId=opendaylight-snapshot \ -Durl="$ODLNEXUSPROXY/content/repositories/opendaylight.snapshot/" \ -DgroupId="org.opendaylight.integration.${GERRIT_PROJECT//\//.}" \ - -DartifactId=${KARAF_ARTIFACT} \ + -DartifactId="${KARAF_ARTIFACT}" \ -Dversion="${BUNDLE_VERSION}" \ -Dpackaging=zip \ || true # Sandbox is not allowed to uplad to Nexus. @@ -28,4 +29,8 @@ echo "Bundle uploaded to ${BUNDLE_URL}" # Re-inject the new BUNDLE_URL for downstream jobs to pull from Nexus cat > "${WORKSPACE}/integration-upload-distribution.env" <