X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Finclude-raw-integration-get-bundle-vars.sh;h=9772004f3c37f17592ea215fdc4c9ce273fde43d;hb=e5c722ba38aee2f3132187e97925ac9e5f75f4fe;hp=11c90a9cc280d9c1acf95ba942caf74a0e60aa3b;hpb=6c1a666c70befa27ffae3e6a4b5d811f6a7886a5;p=releng%2Fbuilder.git

diff --git a/jjb/integration/include-raw-integration-get-bundle-vars.sh b/jjb/integration/include-raw-integration-get-bundle-vars.sh
index 11c90a9cc..9772004f3 100644
--- a/jjb/integration/include-raw-integration-get-bundle-vars.sh
+++ b/jjb/integration/include-raw-integration-get-bundle-vars.sh
@@ -4,10 +4,12 @@ echo "#################################################"
 
 NEXUSURL_PREFIX=${ODLNEXUSPROXY:-https://nexus.opendaylight.org}
 ODL_NEXUS_REPO=${ODL_NEXUS_REPO:-content/repositories/opendaylight.snapshot}
+GERRIT_PATH=${GERRIT_PATH:-git.opendaylight.org/gerrit}
+DISTROBRANCH=${DISTROBRANCH:-$GERRIT_BRANCH}
 
 if [ ${BUNDLEURL} == 'last' ]; then
     # 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"
+    wget "http://${GERRIT_PATH}/gitweb?p=integration/distribution.git;a=blob_plain;f=pom.xml;hb=refs/heads/$DISTROBRANCH" -O "pom.xml"
     # Extract the BUNDLEVERSION from the pom.xml
     BUNDLEVERSION=`xpath pom.xml '/project/version/text()' 2> /dev/null`
     echo "Bundle version is ${BUNDLEVERSION}"
@@ -23,8 +25,8 @@ if [ ${BUNDLEURL} == 'last' ]; then
 else
     ACTUALBUNDLEURL="${BUNDLEURL}"
     BUNDLE="${BUNDLEURL##*/}"
-    BUNDLEFOLDER="${BUNDLE//.zip}"
-    BUNDLEVERSION="${BUNDLEFOLDER//distribution-karaf-}"
+    BUNDLEVERSION="$(basename $(dirname $BUNDLEURL))"
+    BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}"
 fi
 
 if [ ${JDKVERSION} == 'openjdk8' ]; then