Merge "Update automated project templates"

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

diff --git a/jjb/integration/include-raw-integration-deploy-controller-verify.sh b/jjb/integration/include-raw-integration-deploy-controller-verify.sh
index 3a15b14561e144583670995dfad7cad409a52267..d7b57d004a749e3df0ff05d06a913ccb23079bf7 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-verify.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-verify.sh
@@ -35,6 +35,9 @@ netstat -natu
 echo "redirected karaf console output to karaf_console.log"
 export KARAF_REDIRECT=${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log
 
+echo "JDK Version ..."
+java -version
+
 echo "Starting controller..."
 ${WORKSPACE}/${BUNDLEFOLDER}/bin/start
 
@@ -73,8 +76,10 @@ function exit_on_log_file_message {
     echo "looking for \"$1\" in karaf.log file"
     if grep --quiet "$1" ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log; then
         echo ABORTING: found "$1"
-        echo "Dumping first 1M of karaf.log..."
-        head --bytes=1M  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log
+        echo "Dumping first 500K bytes of karaf log..."
+        head --bytes=500K  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log
+        echo "Dumping last 500K bytes of karaf log..."
+        tail --bytes=500K  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log
         cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
         cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
         exit 1
@@ -83,8 +88,10 @@ function exit_on_log_file_message {
     echo "looking for \"$1\" in karaf_console.log file"
     if grep --quiet "$1" ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log; then
         echo ABORTING: found "$1"
-        echo "Dumping first 1M of karaf_console.log..."
-        head --bytes=1M  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log
+        echo "Dumping first 500K bytes of karaf log..."
+        head --bytes=500K  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log
+        echo "Dumping last 500K bytes of karaf log..."
+        tail --bytes=500K  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log
         cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
         cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
         exit 1