Merge "Removing bin/client until we get sshpass or equivalent in rackspace"

diff --git a/jjb/integration/include-raw-integration-deploy-controller-offline.sh b/jjb/integration/include-raw-integration-deploy-controller-offline.sh
index 0848d0376c500d473f659b1b215d4c9a5a3f2313..1d484179458fc7e7ef4fc64a4b7527d25b6b2903 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-offline.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-offline.sh
@@ -67,7 +67,8 @@ echo "sleeping for 20 seconds..."
 sleep 20
 
 echo "Check OSGi bundles..."
-./client "feature:install ${CONTROLLERFEATURES}" || echo $? > ${WORKSPACE}/error.txt
+# Remove until we get sshpass in rackspace
+#./client "feature:install ${CONTROLLERFEATURES}" || echo $? > ${WORKSPACE}/error.txt
 
 echo "Fetching Karaf log"
 cd ${WORKSPACE}

diff --git a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
index 9210b45be3f25b5590e080fcef6f75326bd5cfa6..38b3d9844e050c8adcfd86701fbcfe5759b52545 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -88,7 +88,8 @@ echo "Cool down for 1 min :)..."
 sleep 60
 
 echo "Checking OSGi bundles..."
-./client 'bundle:list'
+# Remove until we get sshpass in rackspace
+#./client 'bundle:list'
 
 EOF