From: Luis Gomez Date: Mon, 24 Apr 2017 01:07:55 +0000 (-0700) Subject: Change variable name BUNDLE_URL->BUNDLE_PATH X-Git-Tag: release/carbon~107^2 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=6cf9eb79a818dc5b9d216c1ea5bf31c1b4854e88;p=releng%2Fbuilder.git Change variable name BUNDLE_URL->BUNDLE_PATH This is to avoid confusion with global variable BUNDLE_URL. Change-Id: I1a22f8e627424bb8d8f629f69bbefd9e1e5c1744 Signed-off-by: Luis Gomez --- diff --git a/jjb/integration/integration-distribution-check.sh b/jjb/integration/integration-distribution-check.sh index bfddce9c0..3099a010d 100644 --- a/jjb/integration/integration-distribution-check.sh +++ b/jjb/integration/integration-distribution-check.sh @@ -4,7 +4,7 @@ ACTUALFEATURES="odl-integration-all" BUNDLEVERSION="$(xpath distribution/pom.xml '/project/version/text()' 2> /dev/null)" BUNDLEFOLDER="${KARAF_ARTIFACT}-${BUNDLEVERSION}" BUNDLE="${BUNDLEFOLDER}.zip" -BUNDLE_URL="/tmp/r/org/opendaylight/integration/${KARAF_ARTIFACT}/${BUNDLEVERSION}/${BUNDLE}" +BUNDLE_PATH="/tmp/r/org/opendaylight/integration/${KARAF_ARTIFACT}/${BUNDLEVERSION}/${BUNDLE}" echo "Kill any controller running" ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh @@ -13,7 +13,7 @@ echo "Clean workspace" rm -rf * echo "Copying the distribution..." -cp "${BUNDLE_URL}" . +cp "${BUNDLE_PATH}" . echo "Extracting the new controller..." unzip -q "${BUNDLE}"