From: mei mei <meimei@huawei.com>
Date: Fri, 3 Aug 2018 09:36:22 +0000 (+0000)
Subject: Merge "[Dovetail] using correct rabbitmq process name"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=57086159e02ce7518c4ec26c7dd5433f07ea3991;hp=-c;p=releng.git

Merge "[Dovetail] using correct rabbitmq process name"
---

57086159e02ce7518c4ec26c7dd5433f07ea3991
diff --combined jjb/dovetail/dovetail-run.sh
index 1fee4ae53,0f88e843d..2797ec5ff
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@@ -207,15 -207,15 +207,15 @@@ if [ -f ${DOVETAIL_CONFIG}/pod.yaml ]; 
      if [ "$INSTALLER_TYPE" == "apex" ]; then
          cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml
  process_info:
- - {testcase_name: dovetail.ha.rabbitmq, attack_process: rabbitmq_server}
+ - {testcase_name: yardstick.ha.rabbitmq, attack_process: rabbitmq_server}
  EOF
      elif [ "$INSTALLER_TYPE" == "fuel" ]; then
          cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml
  process_info:
- - {testcase_name: dovetail.ha.cinder_api, attack_process: cinder-wsgi}
- - {testcase_name: dovetail.ha.rabbitmq, attack_process: rabbitmq-server, attack_host: msg01}
- - {testcase_name: dovetail.ha.neutron_l3_agent, attack_process: neutron-l3-agent, attack_host: cmp01}
- - {testcase_name: dovetail.ha.database, attack_process: mysqld, attack_host: dbs01}
+ - {testcase_name: yardstick.ha.cinder_api, attack_process: cinder-wsgi}
+ - {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
      fi
  
@@@ -372,18 -372,11 +372,18 @@@ els
      testarea="--testarea ${TESTAREA}"
  fi
  
 -run_cmd="dovetail run ${testsuite} ${testarea} -d"
 +run_cmd="dovetail run ${testsuite} ${testarea} -d -r"
  echo "Container exec command: ${run_cmd}"
  docker exec $container_id ${run_cmd}
  
  sudo cp -r ${DOVETAIL_HOME}/results ./
 +result_package=$(find ${DOVETAIL_HOME} -name 'logs_*')
 +echo "Results package is ${result_package}"
 +for item in ${result_package};
 +do
 +  sudo mv ${item} ./results
 +done
 +
  # To make sure the file owner is the current user, for the copied results files in the above line
  echo "Change owner of result files ..."
  CURRENT_USER=${SUDO_USER:-$USER}