Merge "Migrate iotdm matrix-verify jobs to freestyle-verify jobs"

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

diff --git a/jjb/integration/include-raw-integration-distribution-check.sh b/jjb/integration/include-raw-integration-distribution-check.sh
index 34859de71024f7e62865f85f1b4a5d652abbf8d0..0b079ff1c8ece1cbfd2f428af34b7816fe3a1f31 100644 (file)
--- a/jjb/integration/include-raw-integration-distribution-check.sh
+++ b/jjb/integration/include-raw-integration-distribution-check.sh
@@ -15,7 +15,7 @@ echo "Copying the distribution..."
 cp  ${BUNDLEURL} .
 
 echo "Extracting the new controller..."
-unzip -o -q ${BUNDLE}
+unzip -q ${BUNDLE}
 
 echo "Configuring the startup features..."
 FEATURESCONF=${WORKSPACE}/${BUNDLEFOLDER}/etc/org.apache.karaf.features.cfg
@@ -83,7 +83,8 @@ echo "loading many features at once.  Need to allow time for problems to show up
 sleep 300
 
 echo "Checking OSGi bundles..."
-sshpass -p karaf ${WORKSPACE}/${BUNDLEFOLDER}/bin/client -u karaf 'bundle:list'
+# sshpass seems to fail with new karaf version
+# sshpass -p karaf ${WORKSPACE}/${BUNDLEFOLDER}/bin/client -u karaf 'bundle:list'
 
 echo "Listing all open ports on controller system"
 netstat -natu