Merge "Add OVS 2.4.0 to ovsdb full integration"

[releng/builder.git] / jjb / integration / include-raw-integration-deploy-controller-offline.sh

diff --git a/jjb/integration/include-raw-integration-deploy-controller-offline.sh b/jjb/integration/include-raw-integration-deploy-controller-offline.sh
index bd29cedd84a4eeb72f881b753983e9c8e118f48e..bb25495c928a2ffa8b92fcc254590df5bc0855df 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-offline.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-offline.sh
@@ -40,7 +40,7 @@ ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
 echo "sleeping for 10 seconds..."
 sleep 10
 
-echo "Check OSGi bundles..."
+echo "Install all features"
 sshpass -p karaf ${WORKSPACE}/${BUNDLEFOLDER}/bin/client -u karaf "feature:install ${ACTUALFEATURES}" || echo $? > ${WORKSPACE}/error.txt
 
 echo "Fetching Karaf log"
@@ -50,7 +50,7 @@ echo "Kill controller"
 ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
 
 echo "Exit with error"
-if [ `cat error.txt` -ne 0 ]; then
+if [ -f ${WORKSPACE}/error.txt ]; then
     echo "Failed to deploy offline"
     exit 1
 fi