X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fintegration%2Fintegration-detect-variables.sh;h=f28711cd8b736bf32b786c9500b0135639842280;hb=179a0cd0e9ef329842f8114588fd7928b533835f;hp=009e0fe4b45304a406a4614e27b4067bd5cab0e0;hpb=ece6a462c2e9580514d1e610d8f81c1e805e6685;p=releng%2Fbuilder.git

diff --git a/jjb/integration/integration-detect-variables.sh b/jjb/integration/integration-detect-variables.sh
index 009e0fe4b..f28711cd8 100644
--- a/jjb/integration/integration-detect-variables.sh
+++ b/jjb/integration/integration-detect-variables.sh
@@ -20,16 +20,12 @@ if [ ${BUNDLE_URL} == 'last' ]; then
     BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}"
     BUNDLE="${KARAF_ARTIFACT}-${TIMESTAMP}.zip"
     ACTUAL_BUNDLE_URL="${NEXUSPATH}/${BUNDLEVERSION}/${BUNDLE}"
-elif [[ "${BUNDLE_URL}" == *"distribution-check"* ]]; then
-    ACTUAL_BUNDLE_URL="${BUNDLE_URL}"
-    BUNDLE="${BUNDLE_URL##*/}"
-    BUNDLEFOLDER="${BUNDLE//.zip}"
-    BUNDLEVERSION="${BUNDLEFOLDER//$KARAF_ARTIFACT-}"
 else
     ACTUAL_BUNDLE_URL="${BUNDLE_URL}"
     BUNDLE="${BUNDLE_URL##*/}"
+    ARTIFACT="$(basename "$(dirname "$(dirname "${BUNDLE_URL}")")")"
     BUNDLEVERSION="$(basename "$(dirname "${BUNDLE_URL}")")"
-    BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}"
+    BUNDLEFOLDER="${ARTIFACT}-${BUNDLEVERSION}"
 fi
 
 echo "Distribution bundle URL is ${ACTUAL_BUNDLE_URL}"