Merge "netvirt devstack - add external network support"

[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 1f6b03b224dffc2ea324116a224b24894cf754a3..82c50b07b32f70358ecd845ae3a2ae96c1dd3c23 100644 (file)
--- a/jjb/integration/include-raw-integration-distribution-check.sh
+++ b/jjb/integration/include-raw-integration-distribution-check.sh
@@ -54,6 +54,9 @@ readlink -e "${JAVA_HOME}/bin/java"
 echo "JDK Version should be overriden by JAVA_HOME"
 java -version
 
+echo "Redirecting karaf console output to karaf_console.log"
+export KARAF_REDIRECT="${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log"
+
 echo "Starting controller..."
 ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
 
@@ -83,7 +86,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
@@ -118,6 +122,7 @@ exit_on_log_file_message 'BindException: Address already in use'
 exit_on_log_file_message 'server is unhealthy'
 
 echo "Fetching Karaf logs"
+# TODO: Move instead of copy? Gzip?
 cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
 cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .