Merge "Make distribution-check job an ODL-releng templated job"

[releng/builder.git] / jjb / integration / include-raw-integration-get-bundle-vars.sh

diff --git a/jjb/integration/include-raw-integration-get-bundle-vars.sh b/jjb/integration/include-raw-integration-get-bundle-vars.sh
index 5da4603b02bae34f0fa7190fe22311a257a01f50..641503ebabbcfaff5ef11ff4ad101106b87274ee 100644 (file)
--- a/jjb/integration/include-raw-integration-get-bundle-vars.sh
+++ b/jjb/integration/include-raw-integration-get-bundle-vars.sh
@@ -5,11 +5,13 @@ echo "#################################################"
 NEXUSURL_PREFIX=${ODLNEXUSPROXY:-https://nexus.opendaylight.org}
 
 if [ ${BUNDLEURL} == 'last' ]; then
-    NEXUSPATH="${NEXUSURL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-karaf"
+    # Obtain current pom.xml of integration/distribution, correct branch.
+    wget "http://git.opendaylight.org/gerrit/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$BRANCH" -O "pom.xml"
     # Extract the BUNDLEVERSION from the pom.xml
-    BUNDLEVERSION=`xpath distribution/pom.xml '/project/version/text()' 2> /dev/null`
+    BUNDLEVERSION=`xpath pom.xml '/project/version/text()' 2> /dev/null`
     echo "Bundle version is ${BUNDLEVERSION}"
     # Acquire the timestamp information from maven-metadata.xml
+    NEXUSPATH="${NEXUSURL_PREFIX}/content/repositories/opendaylight.snapshot/org/opendaylight/integration/distribution-karaf"
     wget ${NEXUSPATH}/${BUNDLEVERSION}/maven-metadata.xml
     less maven-metadata.xml
     TIMESTAMP=`xpath maven-metadata.xml "//snapshotVersion[extension='zip'][1]/value/text()" 2>/dev/null`