X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Finclude-raw-integration-get-bundle-vars.sh;h=6b57c40272c8262ae5a7e4d9524b41f91de19928;hb=b44aaa0cfbb05c8250c06d9dac16085f1e9ac732;hp=6c5f5cb467ca5193640c2bf13167d898cbc7e424;hpb=e99ed4f7ec0cf5123c5dbee4e2aa4cd14b061923;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 6c5f5cb46..6b57c4027 100644 --- a/jjb/integration/include-raw-integration-get-bundle-vars.sh +++ b/jjb/integration/include-raw-integration-get-bundle-vars.sh @@ -22,11 +22,16 @@ if [ ${BUNDLEURL} == 'last' ]; then BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}" BUNDLE="distribution-karaf-${TIMESTAMP}.zip" ACTUALBUNDLEURL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}" -else +elif [[ ${BUNDLEURL} == *"distribution-check"* ]]; then ACTUALBUNDLEURL="${BUNDLEURL}" BUNDLE="${BUNDLEURL##*/}" BUNDLEFOLDER="${BUNDLE//.zip}" BUNDLEVERSION="${BUNDLEFOLDER//distribution-karaf-}" +else + ACTUALBUNDLEURL="${BUNDLEURL}" + BUNDLE="${BUNDLEURL##*/}" + BUNDLEVERSION="$(basename $(dirname $BUNDLEURL))" + BUNDLEFOLDER="distribution-karaf-${BUNDLEVERSION}" fi if [ ${JDKVERSION} == 'openjdk8' ]; then