show karaf.log tail instead of head when controller doesn't come up.

Change-Id: Ia3b2b06c5b0d5fa6521f8cdc78920e438aa77e9f
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/jjb/integration/include-raw-integration-deploy-controller-offline.sh b/jjb/integration/include-raw-integration-deploy-controller-offline.sh
index 72a2009eaeb6f289045ac391f1fb810ce22f8d8c..97c4f548a9f470a0b9e92680b2fd22e2aa0daf07 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-offline.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-offline.sh
@@ -49,7 +49,7 @@ echo "Installing all features..."
 sshpass -p karaf ${WORKSPACE}/${BUNDLEFOLDER}/bin/client -u karaf "feature:install ${ACTUALFEATURES}" || echo $? > ${WORKSPACE}/error.txt
 
 echo "Killing ODL and fetching Karaf log..."
-head --bytes=1M "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" > "karaf.log"
+tail --bytes=1M "${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log" > "karaf.log"
 # TODO: Do we want different name for karaf.log chunk to signal it may be not complete?
 ps axf | grep karaf | grep -v grep | awk '{print "kill -9 " $1}' | sh
 sleep 5

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 447acb67c662587f927833d482bc81d90f8c158d..ac62ef50d6e928a03e4a53ccdaaf3d0eb2af5234 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@ -86,7 +86,7 @@ while true; do
     elif (( "\$COUNT" > "600" )); then
         echo Timeout Controller DOWN
         echo "Dumping Karaf log..."
-        head --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+        tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
         echo "Listing all open ports on controller system"
         netstat -natu
         exit 1
@@ -108,7 +108,7 @@ function exit_on_log_file_message {
     if grep --quiet "\$1" /tmp/${BUNDLEFOLDER}/data/log/karaf.log; then
         echo ABORTING: found "\$1"
         echo "Dumping Karaf log..."
-        head --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+        tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
         exit 1
     fi
 }
@@ -140,7 +140,7 @@ pybot -N ${TESTPLAN} -c critical -e exclude -v BUNDLEFOLDER:${BUNDLEFOLDER} -v W
 
 echo "Killing ODL and fetching Karaf log..."
 set +e  # We do not want to create red dot just because something went wrong while fetching logs.
-ssh "${ODL_SYSTEM_IP}" head --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" > "karaf.log"
+ssh "${ODL_SYSTEM_IP}" tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" > "karaf.log"
 ssh "${ODL_SYSTEM_IP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'
 sleep 5
 ssh "${ODL_SYSTEM_IP}" xz -9ekvv "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"

diff --git a/jjb/integration/include-raw-integration-deploy-controller-verify.sh b/jjb/integration/include-raw-integration-deploy-controller-verify.sh
index ff1fd97a60fdf8c6eac7c927ca93c14ed8d1b103..de1aee3643217159459e40ebcbed00a39eb13b6f 100644 (file)
--- a/jjb/integration/include-raw-integration-deploy-controller-verify.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-verify.sh
@@ -77,7 +77,7 @@ function exit_on_log_file_message {
     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
+        tail --bytes=1M  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log
         cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
         cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
         exit 1
@@ -87,7 +87,7 @@ function exit_on_log_file_message {
     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
+        tail --bytes=1M  ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log
         cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf.log .
         cp ${WORKSPACE}/${BUNDLEFOLDER}/data/log/karaf_console.log .
         exit 1

diff --git a/jjb/integration/include-raw-integration-start-cluster-run-test.sh b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
index adba827fb0602b71f99a09b8c47abfa1a3c86192..154d1261fdc614ad2a1207be858671e24f991996 100644 (file)
--- a/jjb/integration/include-raw-integration-start-cluster-run-test.sh
+++ b/jjb/integration/include-raw-integration-start-cluster-run-test.sh
@@ -26,7 +26,7 @@ while true; do
     elif (( "\$COUNT" > "600" )); then
         echo Timeout Controller DOWN
         echo "Dumping Karaf log..."
-        head --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+        tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
         echo "Listing all open ports on controller system"
         netstat -natu
         exit 1
@@ -45,7 +45,7 @@ function exit_on_log_file_message {
     if grep --quiet "\$1" "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"; then
         echo ABORTING: found "\$1"
         echo "Dumping Karaf log..."
-        head --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
+        tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log"
         exit 1
     fi
 }
@@ -99,7 +99,7 @@ set +e  # We do not want to create red dot just because something went wrong whi
 for i in `seq 1 ${NUM_ODL_SYSTEM}`
 do
     CONTROLLERIP=ODL_SYSTEM_${i}_IP
-    ssh "${!CONTROLLERIP}" head --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" > "odl${i}_karaf.log"
+    ssh "${!CONTROLLERIP}" tail --bytes=1M "/tmp/${BUNDLEFOLDER}/data/log/karaf.log" > "odl${i}_karaf.log"
     ssh "${!CONTROLLERIP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh'
 done
 sleep 5