From: Trevor Bramwell <tbramwell@linuxfoundation.org>
Date: Fri, 21 Sep 2018 18:44:21 +0000 (+0000)
Subject: Merge "For compass, the process name is rabbitmq"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=096247edf3195d4249787b01a73b8ad1ea4a200e;hp=-c;p=releng.git

Merge "For compass, the process name is rabbitmq"
---

096247edf3195d4249787b01a73b8ad1ea4a200e
diff --combined jjb/dovetail/dovetail-run.sh
index ed636b849,799f15713..065d20128
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@@ -51,6 -51,11 +51,6 @@@ elif [[ ${INSTALLER_TYPE} == 'joid' ]]
      # replace the default one by the customized one provided by jenkins config
  fi
  
 -# Set iptables rule to allow forwarding return traffic for container
 -if ! sudo iptables -C FORWARD -j RETURN 2> ${redirect} || ! sudo iptables -L FORWARD | awk 'NR==3' | grep RETURN 2> ${redirect}; then
 -    sudo iptables -I FORWARD -j RETURN
 -fi
 -
  releng_repo=${WORKSPACE}/releng
  [ -d ${releng_repo} ] && sudo rm -rf ${releng_repo}
  git clone https://gerrit.opnfv.org/gerrit/releng ${releng_repo} >/dev/null
@@@ -212,6 -217,11 +212,11 @@@ process_info
  - {testcase_name: yardstick.ha.rabbitmq, attack_process: rabbitmq_server, attack_host: msg01}
  - {testcase_name: yardstick.ha.neutron_l3_agent, attack_process: neutron-l3-agent, attack_host: cmp01}
  - {testcase_name: yardstick.ha.database, attack_process: mysqld, attack_host: dbs01}
+ EOF
+     elif [ "$INSTALLER_TYPE" == "compass" ]; then
+         cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml
+ process_info:
+ - {testcase_name: yardstick.ha.rabbitmq, attack_process: rabbitmq}
  EOF
      fi