Merge "Fix SC2059 for ShellCheck 0.4.4, printf formatting"

diff --combined jjb/integration/common-functions.sh
index bae69e425b164cce3fdd82ebf1cfd1403302c927,ced2cc36e17028ad4be5186eeb9994d517c8c6c8..2c466d220a3f8c8052102af87620be5fc1e0396d
--- 1/jjb/integration/common-functions.sh
--- 2/jjb/integration/common-functions.sh
+++ b/jjb/integration/common-functions.sh
@@@ -133,40 -133,6 +133,40 @@@ function get_os_deploy() 
      export OPENSTACK_TOPO
  }
  
 +function get_test_suites() {
 +
 +    #let the caller pick the name of the variable we will assign the suites to
 +    local __suite_list=$1
 +
 +    echo "Locating test plan to use..."
 +    testplan_filepath="${WORKSPACE}/test/csit/testplans/${STREAMTESTPLAN}"
 +    if [ ! -f "${testplan_filepath}" ]; then
 +        testplan_filepath="${WORKSPACE}/test/csit/testplans/${TESTPLAN}"
 +    fi
 +
 +    echo "Changing the testplan path..."
 +    cat "${testplan_filepath}" | sed "s:integration:${WORKSPACE}:" > testplan.txt
 +    cat testplan.txt
 +
 +    # Use the testplan if specific SUITES are not defined.
 +    if [ -z "${SUITES}" ]; then
 +        suite_list=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
 +    else
 +        suite_list=""
 +        workpath="${WORKSPACE}/test/csit/suites"
 +        for suite in ${SUITES}; do
 +            fullsuite="${workpath}/${suite}"
 +            if [ -z "${suite_list}" ]; then
 +                suite_list+=${fullsuite}
 +            else
 +                suite_list+=" "${fullsuite}
 +            fi
 +        done
 +    fi
 +
 +    eval $__suite_list="'$suite_list'"
 +}
 +
  function run_plan() {
      local -r type=$1
  
@@@ -179,7 -145,7 +179,7 @@@
          ;;
      esac
  
-     printf "Locating ${type} plan to use...\n"
+     printf "Locating %s plan to use...\n" "${type}"
      plan_filepath="${WORKSPACE}/test/csit/${type}plans/$plan"
      if [ ! -f "${plan_filepath}" ]; then
          plan_filepath="${WORKSPACE}/test/csit/${type}plans/${STREAMTESTPLAN}"
@@@ -189,17 -155,17 +189,17 @@@
      fi
  
      if [ -f "${plan_filepath}" ]; then
-         printf "${type} plan exists!!!\n"
-         printf "Changing the ${type} plan path...\n"
+         printf "%s plan exists!!!\n" "${type}"
+         printf "Changing the %s plan path...\n" "${type}"
          cat ${plan_filepath} | sed "s:integration:${WORKSPACE}:" > ${type}plan.txt
          cat ${type}plan.txt
          for line in $( egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' ${type}plan.txt ); do
-             printf "Executing ${line}...\n"
+             printf "Executing %s...\n" "${line}"
              # shellcheck source=${line} disable=SC1091
              source ${line}
          done
      fi
-     printf "Finished running ${type} plans\n"
+     printf "Finished running %s plans\n" "${type}"
  } # function run_plan()
  
  # Return elapsed time. Usage:
@@@ -209,7 -175,7 +209,7 @@@ function timer(
  {
      if [ $# -eq 0 ]; then
          # return the current time
-         printf "$(date "+%s")"
+         printf "%s" "$(date "+%s")"
      else
          local start_time=$1
          end_time=$(date "+%s")
@@@ -302,7 -268,7 +302,7 @@@ function tcpdump_start() 
      local -r filter=$3
      filter_=${filter// /_}
  
-     printf "node ${ip}, ${prefix}_${ip}__${filter}: starting tcpdump\n"
+     printf "node %s, %s_%s__%s: starting tcpdump\n" "${ip}" "${prefix}" "${ip}" "${filter}"
      ssh ${ip} "nohup sudo /usr/sbin/tcpdump -vvv -ni eth0 ${filter} -w /tmp/tcpdump_${prefix}_${ip}__${filter_}.pcap > /tmp/tcpdump_start.log 2>&1 &"
      ${SSH} ${ip} "ps -ef | grep tcpdump"
  }
@@@ -310,7 -276,7 +310,7 @@@
  function tcpdump_stop() {
      local -r ip=$1
  
-     printf "node $ip: stopping tcpdump\n"
+     printf "node %s: stopping tcpdump\n" "$ip"
      ${SSH} ${ip} "ps -ef | grep tcpdump.sh"
      ${SSH} ${ip} "sudo pkill -f tcpdump"
      ${SSH} ${ip} "sudo xz -9ekvvf /tmp/*.pcap"
@@@ -366,7 -332,7 +366,7 @@@ function collect_openstack_logs() 
      local -r node_type=${3}
      local oslogs="${folder}/oslogs"
  
-     printf "collect_openstack_logs for ${node_type} node: ${ip} into ${oslogs}\n"
+     printf "collect_openstack_logs for %s node: %s into %s\n" "${node_type}" "${ip}" "${oslogs}"
      rm -rf ${oslogs}
      mkdir -p ${oslogs}
      # There are always some logs in /opt/stack/logs and this also covers the
@@@ -406,7 -372,7 +406,7 @@@ f
  ls -al /tmp/oslogs
  EOF
  # cat > ${WORKSPACE}/collect_openstack_logs.sh << EOF
-         printf "collect_openstack_logs for ${node_type} node: ${ip} into ${oslogs}, executing script\n"
+         printf "collect_openstack_logs for %s node: %s into %s, executing script\n" "${node_type}" "${ip}" "${oslogs}"
          cat ${WORKSPACE}/collect_openstack_logs.sh
          scp ${WORKSPACE}/collect_openstack_logs.sh ${ip}:/tmp
          ${SSH} ${ip} "bash /tmp/collect_openstack_logs.sh > /tmp/collect_openstack_logs.log 2>&1"

diff --combined jjb/integration/integration-deploy-openstack-run-test.sh
index daaba59ebc571862216704e1d20e5115ebc45d54,6c6ecbd699c936ebf12673d4bfdd967fdfb2c2b9..277e488ef5797e59daae8b2a35f84daf6e996056
--- 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
@@@ -123,7 -123,7 +123,7 @@@ function install_rdo_release() 
  # Involves just setting up the shared directory
  function setup_live_migration_control() {
      local control_ip=$1
-     printf "${control_ip}:Setup directory Share with NFS"
+     printf "%s:Setup directory Share with NFS" "${control_ip}"
      cat > ${WORKSPACE}/setup_live_migration_control.sh << EOF
  sudo mkdir --mode=777 /vm_instances
  sudo chown -R jenkins:jenkins /vm_instances
@@@ -140,8 -140,8 +140,8 @@@ EO
  function setup_live_migration_compute() {
      local compute_ip=$1
      local control_ip=$2
-     printf "${compute_ip}:Mount Shared directory from ${control_ip}"
-     printf "${compute_ip}:Configure libvirt in listen mode"
+     printf "%s:Mount Shared directory from ${control_ip}" "${compute_ip}"
+     printf "%s:Configure libvirt in listen mode" "${compute_ip}"
      cat >  ${WORKSPACE}/setup_live_migration_compute.sh << EOF
  sudo yum install -y libvirt libvirt-devel nfs-utils
  sudo crudini --verbose  --set --inplace /etc/libvirt/libvirtd.conf '' listen_tls 0
@@@ -1075,7 -1075,32 +1075,7 @@@ els
      HA_PROXY_3_IP=${ODL_SYSTEM_3_IP}
  fi
  
 -echo "Locating test plan to use..."
 -testplan_filepath="${WORKSPACE}/test/csit/testplans/${STREAMTESTPLAN}"
 -if [ ! -f "${testplan_filepath}" ]; then
 -    testplan_filepath="${WORKSPACE}/test/csit/testplans/${TESTPLAN}"
 -fi
 -
 -echo "Changing the testplan path..."
 -cat "${testplan_filepath}" | sed "s:integration:${WORKSPACE}:" > testplan.txt
 -cat testplan.txt
 -
 -# Use the testplan if specific SUITES are not defined.
 -if [ -z "${SUITES}" ]; then
 -    SUITES=`egrep -v '(^[[:space:]]*#|^[[:space:]]*$)' testplan.txt | tr '\012' ' '`
 -else
 -    newsuites=""
 -    workpath="${WORKSPACE}/test/csit/suites"
 -    for suite in ${SUITES}; do
 -        fullsuite="${workpath}/${suite}"
 -        if [ -z "${newsuites}" ]; then
 -            newsuites+=${fullsuite}
 -        else
 -            newsuites+=" "${fullsuite}
 -        fi
 -    done
 -    SUITES=${newsuites}
 -fi
 +get_test_suites SUITES
  
  #install all client versions required for this job testing
  install_openstack_clients_in_robot_vm