From fa6a765c147642a66c756772d8738beac2214aa1 Mon Sep 17 00:00:00 2001 From: Jamo Luhrsen Date: Mon, 15 May 2017 13:04:01 -0700 Subject: [PATCH] Enable java thread dumps for netvirt csit Change-Id: I8193e74e57575a14a3a4f7f3e555572cd847f6c6 Signed-off-by: Jamo Luhrsen --- ...clude-raw-integration-deploy-controller-run-test.sh | 10 +++++----- ...nclude-raw-integration-deploy-openstack-run-test.sh | 3 +++ 2 files changed, 8 insertions(+), 5 deletions(-) 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 b20f1ad57..7e7ff6791 100644 --- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh +++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh @@ -238,11 +238,6 @@ done echo "Cool down for ${COOLDOWN_PERIOD} seconds :)..." sleep ${COOLDOWN_PERIOD} -if [ ${NUM_OPENSTACK_SYSTEM} -gt 0 ]; then - echo "Exiting without running tests to deploy openstack for testing" - exit -fi - echo "Generating controller variables..." for i in `seq 1 ${NUM_ODL_SYSTEM}` do @@ -253,6 +248,11 @@ do ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_before.log || true done +if [ ${NUM_OPENSTACK_SYSTEM} -gt 0 ]; then + echo "Exiting without running tests to deploy openstack for testing" + exit +fi + echo "Generating mininet variables..." for i in `seq 1 ${NUM_TOOLS_SYSTEM}` do diff --git a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh index c3e110fd5..d22ccf130 100644 --- a/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh +++ b/jjb/integration/include-raw-integration-deploy-openstack-run-test.sh @@ -370,6 +370,9 @@ 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 + echo "Lets's take the karaf thread dump again..." + KARAF_PID=$(ssh ${!CONTROLLERIP} "ps aux | grep ${KARAF_ARTIFACT} | grep -v grep | tr -s ' ' | cut -f2 -d' '") + ssh ${!CONTROLLERIP} "jstack $KARAF_PID"> ${WORKSPACE}/karaf_${i}_threads_after.log || true echo "killing karaf process..." ${SSH} "${!CONTROLLERIP}" bash -c 'ps axf | grep karaf | grep -v grep | awk '"'"'{print "kill -9 " $1}'"'"' | sh' done -- 2.36.6