Merge "Update AR projects with all file types to log"

[releng/builder.git] / jjb / integration / integration-distribution-check.sh

diff --git a/jjb/integration/integration-distribution-check.sh b/jjb/integration/integration-distribution-check.sh
index bfddce9c0ea7d7a7ab8495fd9c976e09151729e1..0b6b446fdd178b65ee463ffad2539de469fb1c14 100644 (file)
--- a/jjb/integration/integration-distribution-check.sh
+++ b/jjb/integration/integration-distribution-check.sh
@@ -4,16 +4,16 @@ 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
 
-echo "Clean workspace"
-rm -rf *
+echo "Clean Existing distribution"
+rm -rf ${BUNDLEFOLDER}
 
 echo "Copying the distribution..."
-cp "${BUNDLE_URL}" .
+cp "${BUNDLE_PATH}" .
 
 echo "Extracting the new controller..."
 unzip -q "${BUNDLE}"