X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-upload-distribution.sh;h=354401b1411dd3ab2ccf268322e2caf6a2afdb19;hb=85dab9f19d9c747d186693b9136342f3cded3222;hp=e9e2bdf828c28cf9075947fde2c66a9a83e2e17d;hpb=6e54d42d5a08f4bf66f0203f37acfc841e7e8f85;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-upload-distribution.sh b/jjb/integration/integration-upload-distribution.sh
index e9e2bdf82..354401b14 100644
--- a/jjb/integration/integration-upload-distribution.sh
+++ b/jjb/integration/integration-upload-distribution.sh
@@ -2,30 +2,35 @@
 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.
 
 cat "${LOG_FILE}"
 
-BUNDLE_URL=$(grep "Uploaded.*${KARAF_ARTIFACT}/${BUNDLE_VERSION}.*.zip" ${LOG_FILE} | awk '{print $3}') || true
+BUNDLE_URL=$(grep "Uploaded.*${KARAF_ARTIFACT}/${BUNDLE_VERSION}.*.zip" ${LOG_FILE} | awk '{print $5}') || true
 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" <<EOF
 BUNDLE_URL=${BUNDLE_URL}
+BUNDLE_VERSION=${BUNDLE_VERSION}
+BUNDLEFOLDER=${BUNDLEFOLDER}
+BUNDLE=${BUNDLE}
+BUNDLE_PATH=${BUNDLE_PATH}
 EOF