aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtests/ci/yardstick-verify4
-rw-r--r--yardstick/benchmark/scenarios/compute/qemu_migrate.py2
-rw-r--r--yardstick/benchmark/scenarios/compute/qemu_migrate_benchmark.bash6
3 files changed, 9 insertions, 3 deletions
diff --git a/tests/ci/yardstick-verify b/tests/ci/yardstick-verify
index ca8a0b27a..f3e7a49e3 100755
--- a/tests/ci/yardstick-verify
+++ b/tests/ci/yardstick-verify
@@ -87,7 +87,9 @@ error_exit()
exitcode=$rc
fi
- cleanup
+ if [[ "${DEPLOY_SCENARIO:0:2}" == 'os' ]];then
+ source "${YARDSTICK_REPO_DIR}/tests/ci/clean_images.sh"
+ fi
echo "Exiting with RC=$exitcode"
diff --git a/yardstick/benchmark/scenarios/compute/qemu_migrate.py b/yardstick/benchmark/scenarios/compute/qemu_migrate.py
index 6c0446bb7..6cfedc17a 100644
--- a/yardstick/benchmark/scenarios/compute/qemu_migrate.py
+++ b/yardstick/benchmark/scenarios/compute/qemu_migrate.py
@@ -106,7 +106,7 @@ class QemuMigrate(base.Scenario):
cmd_args = " %s %s %s %s %s %s" %\
(smp, qmp_sock_src, qmp_sock_dst, incoming_ip,
migrate_to_port, max_down_time)
- cmd = "bash migrate_benchmark.sh %s" % (cmd_args)
+ cmd = "bash qemu_migrate_benchmark.sh %s" % (cmd_args)
LOG.debug("Executing command: %s", cmd)
status, stdout, stderr = self.host.execute(cmd)
if status:
diff --git a/yardstick/benchmark/scenarios/compute/qemu_migrate_benchmark.bash b/yardstick/benchmark/scenarios/compute/qemu_migrate_benchmark.bash
index 552098103..d9a440c89 100644
--- a/yardstick/benchmark/scenarios/compute/qemu_migrate_benchmark.bash
+++ b/yardstick/benchmark/scenarios/compute/qemu_migrate_benchmark.bash
@@ -14,6 +14,7 @@ set -e
# Commandline arguments
src=$2
+dst=$3
dst_ip=$4
migrate_to_port=$5
max_down_time=$6
@@ -22,7 +23,6 @@ OUTPUT_FILE=/tmp/output-qemu.log
do_migrate()
{
-# local src=`echo $OPTIONS | cut -d ':' -f 2 | cut -d ',' -f 1`
echo "info status" | nc -U $src
# with no speed limit
echo "migrate_set_speed 0" |nc -U $src
@@ -45,7 +45,9 @@ output_qemu()
# print detail information
echo "info migrate" | nc -U $src
echo "quit" | nc -U $src
+ echo "quit" | nc -u $dst
sleep 5
+ echo "Migration executed successfully"
} > $OUTPUT_FILE
@@ -64,5 +66,7 @@ echo -e "{ \
main()
{
do_migrate
+ output_qemu
+ output_json
}
main