From: Luis Gomez Date: Tue, 13 Oct 2015 17:22:44 +0000 (+0000) Subject: Merge "adding netstat deployment before and after controller deployment" X-Git-Tag: release/beryllium~460 X-Git-Url: https://git.opendaylight.org/gerrit/gitweb?a=commitdiff_plain;h=6b812c1a38b56101b15babe2efc8b877b54cdca9;p=releng%2Fbuilder.git Merge "adding netstat deployment before and after controller deployment" --- 6b812c1a38b56101b15babe2efc8b877b54cdca9 diff --cc jjb/integration/include-raw-integration-deploy-controller-run-test.sh index 865c31a69,ec9e691e3..cc617f7a8 --- a/jjb/integration/include-raw-integration-deploy-controller-run-test.sh +++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh @@@ -79,10 -84,21 +84,21 @@@ sleep 6 echo "Checking OSGi bundles..." sshpass -p karaf /tmp/${BUNDLEFOLDER}/bin/client -u karaf 'bundle:list' + echo "Listing all open ports on controller system" + netstat -natu + + # checking for any bind exceptions in log which could indicate a port conflict + if grep --quiet 'BindException: Address already in use' /tmp/${BUNDLEFOLDER}/data/log/karaf.log; then + echo BindException found: Possible port conflict + echo "Dumping Karaf log..." + cat /tmp/${BUNDLEFOLDER}/data/log/karaf.log + exit 1 + fi + EOF -scp ${WORKSPACE}/controller-script.sh ${CONTROLLER0}:/tmp -ssh ${CONTROLLER0} 'bash /tmp/controller-script.sh' +scp ${WORKSPACE}/controller-script.sh ${ODL_SYSTEM_IP}:/tmp +ssh ${ODL_SYSTEM_IP} 'bash /tmp/controller-script.sh' echo "Changing the testplan path..." cat ${WORKSPACE}/test/csit/testplans/${TESTPLAN} | sed "s:integration:${WORKSPACE}:" > testplan.txt diff --cc jjb/integration/include-raw-integration-deploy-controller.sh index 6bff8acc7,d2562f7a2..5a0e8debb --- a/jjb/integration/include-raw-integration-deploy-controller.sh +++ b/jjb/integration/include-raw-integration-deploy-controller.sh @@@ -38,14 -38,17 +38,17 @@@ MEMCONF=/tmp/${BUNDLEFOLDER}/bin/seten sed -ie 's/JAVA_MAX_MEM="2048m"/JAVA_MAX_MEM="${CONTROLLERMEM}"/g' \${MEMCONF} cat \${MEMCONF} + echo "Listing all open ports on controller system" + netstat -natu + EOF -CONTROLLERIPS=(${CONTROLLER0} ${CONTROLLER1} ${CONTROLLER2}) -for i in "${!CONTROLLERIPS[@]}" +ODL_SYSTEM_IPS=(${ODL_SYSTEM_1_IP} ${ODL_SYSTEM_2_IP} ${ODL_SYSTEM_3_IP}) +for i in "${!ODL_SYSTEM_IPS[@]}" do - echo "Installing distribution in member-$((i+1)) with IP address ${CONTROLLERIPS[$i]}" - scp ${WORKSPACE}/deploy-controller-script.sh ${CONTROLLERIPS[$i]}:/tmp - ssh ${CONTROLLERIPS[$i]} 'bash /tmp/deploy-controller-script.sh' + echo "Installing distribution in member-$((i+1)) with IP address ${ODL_SYSTEM_IPS[$i]}" + scp ${WORKSPACE}/deploy-controller-script.sh ${ODL_SYSTEM_IPS[$i]}:/tmp + ssh ${ODL_SYSTEM_IPS[$i]} 'bash /tmp/deploy-controller-script.sh' done # vim: ts=4 sw=4 sts=4 et ft=sh : diff --cc jjb/integration/include-raw-integration-start-cluster-run-test.sh index ad112030a,7e725a2f3..4f74dc908 --- a/jjb/integration/include-raw-integration-start-cluster-run-test.sh +++ b/jjb/integration/include-raw-integration-start-cluster-run-test.sh @@@ -37,14 -39,25 +39,25 @@@ don echo "Checking OSGi bundles..." sshpass -p karaf /tmp/${BUNDLEFOLDER}/bin/client -u karaf 'bundle:list' + echo "Listing all open ports on controller system" + netstat -natu + + # checking for any bind exceptions in log which could indicate a port conflict + if grep --quiet 'BindException: Address already in use' /tmp/${BUNDLEFOLDER}/data/log/karaf.log; then + echo BindException found: Possible port conflict + echo "Dumping Karaf log..." + cat /tmp/${BUNDLEFOLDER}/data/log/karaf.log + exit 1 + fi + EOF -CONTROLLERIPS=(${CONTROLLER0} ${CONTROLLER1} ${CONTROLLER2}) -for i in "${!CONTROLLERIPS[@]}" +ODL_SYSTEM_IPS=(${ODL_SYSTEM_1_IP} ${ODL_SYSTEM_2_IP} ${ODL_SYSTEM_3_IP}) +for i in "${!ODL_SYSTEM_IPS[@]}" do - echo "Verifying member-$((i+1)) with IP address ${CONTROLLERIPS[$i]} is UP" - scp ${WORKSPACE}/verify-cluster-is-up.sh ${CONTROLLERIPS[$i]}:/tmp - ssh ${CONTROLLERIPS[$i]} "bash /tmp/verify-cluster-is-up.sh $((i+1)) ${CONTROLLERIPS[$i]}" + echo "Verifying member-$((i+1)) with IP address ${ODL_SYSTEM_IPS[$i]} is UP" + scp ${WORKSPACE}/verify-cluster-is-up.sh ${ODL_SYSTEM_IPS[$i]}:/tmp + ssh ${ODL_SYSTEM_IPS[$i]} "bash /tmp/verify-cluster-is-up.sh $((i+1)) ${ODL_SYSTEM_IPS[$i]}" done echo "Cool down for 1 min :)..."