Merge "Make robot report logs better"

diff --combined jjb/integration/integration-deploy-openstack-run-test.sh
index 4d331abd32f15dc9c71fef12054c5c56152f5fdc,8e75752b7a50a1d8318b06b95d6de408b01abed5..f2fef4655e30b6d0ec15701eda3b965b31727e3b
--- 1/jjb/integration/integration-deploy-openstack-run-test.sh
--- 2/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@@ -1,4 -1,4 +1,4 @@@
- #@IgnoreInspection BashAddShebang
+ #!/bin/bash
  # Activate robotframework virtualenv
  # ${ROBOT_VENV} comes from the integration-install-robotframework.sh
  # script.
@@@ -1081,10 -1081,6 +1081,10 @@@ for i in `seq 1 ${NUM_OPENSTACK_SITES}`
          sudo ip netns exec pnf_ns ifconfig pnf_veth1 up ${EXTNET_PNF_IP}/24;
          sudo ovs-vsctl add-port ${PUBLIC_BRIDGE} pnf_veth0;
      "
 +    # Control Node - set VXLAN TEP IP for Genius Auto TZ
 +    ${SSH} ${!CONTROLIP} "
 +        sudo ovs-vsctl set O . external_ids:tep-ip=${!CONTROLIP};
 +    "
  
      # Control Node - external net internet address simulation
      ${SSH} ${!CONTROLIP} "
@@@ -1105,10 -1101,6 +1105,10 @@@
          ${SSH} $compute_ip "
              sudo ovs-vsctl add-port $PUBLIC_BRIDGE $CONTROLPORT -- set interface $CONTROLPORT type=vxlan options:local_ip=$compute_ip options:remote_ip=${!CONTROLIP} options:dst_port=9876 options:key=flow
          "
 +         #Compute Node - set VXLAN TEP IP for Genius Auto TZ
 +        ${SSH} $compute_ip "
 +            sudo ovs-vsctl set O . external_ids:tep-ip=${compute_ip};
 +        "
      done
  done
  
@@@ -1173,10 -1165,16 +1173,16 @@@ source /tmp/os_netvirt_client_r
  
  echo "Starting Robot test suites ${SUITES} ..."
  # please add pybot -v arguments on a single line and alphabetized
+ suite_num=0
  for suite in ${SUITES}; do
-     log_name_ext=$(basename ${suite} | cut -d. -f1)
-     pybot -N ${TESTPLAN} --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} \
-     --log log_${log_name_ext}.html --report None --output output_${log_name_ext}.xml \
+     # prepend a incrmental counter to the suite name so that the full robot log combining all the suites as is done
+     # in the rebot step below will list all the suites in chronological order as rebot seems to alphabatize them
+     let "suite_num = suite_num + 1"
+     suite_index="$(printf %02d ${suite_num})"
+     suite_name="$(basename ${suite} | cut -d. -f1)"
+     log_name="${suite_index}_${suite_name}"
+     pybot -N ${log_name} --removekeywords wuks -c critical -e exclude -e skip_if_${DISTROSTREAM} \
+     --log log_${log_name}.html --report None --output output_${log_name}.xml \
      -v BUNDLEFOLDER:${BUNDLEFOLDER} \
      -v BUNDLE_URL:${ACTUAL_BUNDLE_URL} \
      -v CONTROLLER_USER:${USER} \
@@@ -1225,7 -1223,7 +1231,7 @@@
      ${TESTOPTIONS} ${suite} || true
  done
  #rebot exit codes seem to be different
- rebot --output ${WORKSPACE}/output.xml --log None --report None output_*.xml || true
+ rebot --output ${WORKSPACE}/output.xml --log log_full.html --report None -N openstack output_*.xml || true
  
  echo "Examining the files in data/log and checking file size"
  ssh ${ODL_SYSTEM_IP} "ls -altr /tmp/${BUNDLEFOLDER}/data/log/"