Merge "Remove bundle:list step from jbb/integration/*-run-tests.sh"

diff --combined jjb/integration/include-raw-integration-deploy-controller-run-test.sh
index 011f0d2e2379c4f117515443227c74ddb4aad38c,b4c6ab40a9fc081ac3055aae730c3bd508bcda40..447acb67c662587f927833d482bc81d90f8c158d
--- 1/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
--- 2/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
+++ b/jjb/integration/include-raw-integration-deploy-controller-run-test.sh
@@@ -26,19 -26,6 +26,19 @@@ f
  
  cat > ${WORKSPACE}/controller-script.sh <<EOF
  
 +if [ ${JDKVERSION} == 'openjdk8' ]; then
 +    echo "Setting the JDK Version to 8"
 +    sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64/jre/bin/java
 +    export JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-1.8.0.60-2.b27.el7_1.x86_64
 +    java -version
 +fi
 +if [ ${JDKVERSION} == 'openjdk7' ]; then
 +    echo "Setting the JDK Version to 7"
 +    sudo /usr/sbin/alternatives --set java /usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64/jre/bin/java
 +    export JAVA_HOME=/usr/lib/jvm/java-1.7.0-openjdk-1.7.0.85-2.6.1.2.el7_1.x86_64
 +    java -version
 +fi
 +
  echo "Changing to /tmp"
  cd /tmp
  
@@@ -69,9 -56,6 +69,9 @@@ cat \${MEMCONF
  echo "Listing all open ports on controller system..."
  netstat -natu
  
 +echo "JDK Version ..."
 +java -version
 +
  echo "Starting controller..."
  /tmp/${BUNDLEFOLDER}/bin/start
  
@@@ -100,9 -84,6 +100,6 @@@ don
  echo "Cool down for 1 min :)..."
  sleep 60
  
- 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
  
@@@ -135,11 -116,9 +132,11 @@@ pybot -N ${TESTPLAN} -c critical -e exc
  -v NEXUSURL_PREFIX:${NEXUSURL_PREFIX} \
  -v CONTROLLER:${ODL_SYSTEM_IP} -v ODL_SYSTEM_IP:${ODL_SYSTEM_IP} -v CONTROLLER_USER:${USER} -v ODL_SYSTEM_USER:${USER} \
  -v TOOLS_SYSTEM_IP:${TOOLS_SYSTEM_IP} -v TOOLS_SYSTEM_2_IP:${TOOLS_SYSTEM_2_IP} -v TOOLS_SYSTEM_3_IP:${TOOLS_SYSTEM_3_IP} \
 +-v TOOLS_SYSTEM_4_IP:${TOOLS_SYSTEM_4_IP} -v TOOLS_SYSTEM_5_IP:${TOOLS_SYSTEM_5_IP} -v TOOLS_SYSTEM_6_IP:${TOOLS_SYSTEM_6_IP} \
  -v TOOLS_SYSTEM_USER:${USER} \
 --v MININET:${TOOLS_SYSTEM_IP} -v MININET1:${TOOLS_SYSTEM_2_IP} -v MININET2:${TOOLS_SYSTEM_3_IP} -v MININET_USER:${USER} \
 --v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true
 +-v MININET:${TOOLS_SYSTEM_IP} -v MININET1:${TOOLS_SYSTEM_2_IP} -v MININET2:${TOOLS_SYSTEM_3_IP} \
 +-v MININET3:${TOOLS_SYSTEM_4_IP} -v MININET4:${TOOLS_SYSTEM_5_IP} -v MININET5:${TOOLS_SYSTEM_6_IP} \
 +-v MININET_USER:${USER} -v USER_HOME:${HOME} ${TESTOPTIONS} ${SUITES} || true
  
  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.