[dovetail] set correct Cinder process name on Apex

[releng.git] / jjb / dovetail / dovetail-run.sh

diff --git a/jjb/dovetail/dovetail-run.sh b/jjb/dovetail/dovetail-run.sh
index 0f88e84..b60ba7d 100755 (executable)
--- a/jjb/dovetail/dovetail-run.sh
+++ b/jjb/dovetail/dovetail-run.sh
@@ -208,6 +208,7 @@ if [ -f ${DOVETAIL_CONFIG}/pod.yaml ]; then
         cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml
 process_info:
 - {testcase_name: yardstick.ha.rabbitmq, attack_process: rabbitmq_server}
+- {testcase_name: yardstick.ha.cinder_api, attack_process: cinder_wsgi}
 EOF
     elif [ "$INSTALLER_TYPE" == "fuel" ]; then
         cat << EOF >> ${DOVETAIL_CONFIG}/pod.yaml
@@ -372,11 +373,18 @@ else
     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}