summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorJiang, Yunhong <yunhong.jiang@intel.com>2017-05-12 22:32:23 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-05-12 22:32:23 +0000
commit2bf84b75999440debecf456168a7c3bb0750dd06 (patch)
tree9a1fb1d7ceb8f637b10b56abaf69e94eb57a77fb /ci
parent224c6bf99ded56edffbd9b5c7e17a4d85a41d1e1 (diff)
parentb49cecbe031d91c0267fef8a2925e72c86f1e6a3 (diff)
Merge "Adding post-execute scripts to cyclictest execution"
Diffstat (limited to 'ci')
-rwxr-xr-xci/envs/cyclictest.sh7
1 files changed, 7 insertions, 0 deletions
diff --git a/ci/envs/cyclictest.sh b/ci/envs/cyclictest.sh
index 920a46b93..d1ae5c7fa 100755
--- a/ci/envs/cyclictest.sh
+++ b/ci/envs/cyclictest.sh
@@ -11,6 +11,7 @@ testName=$2 #idle_idle/stress_idle
HOST_IP=$( getHostIP )
pod_config='/opt/scripts/pod.yaml'
cyclictest_context_file='/opt/kvmfornfv_cyclictest_'${testName}'.yaml'
+yardstick_prefix='/root/yardstick/yardstick/benchmark/scenarios/compute' # yardstick teardown path
if [ ! -f ${pod_config} ] ; then
echo "file ${pod_config} not found"
@@ -22,6 +23,12 @@ if [ ! -f ${cyclictest_context_file} ] ; then
exit 1
fi
+#As yardstick executes only *.bash scripts, copy the post-execute script as .bash script
+cp /opt/scripts/disable_trace.sh ${yardstick_prefix}/disable_trace.bash
+
+#Execution of the post-execute script copied requires re-installation of yardstick
+( cd /root/yardstick ; python setup.py install )
+
#setting up of image for launching guest vm.
ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null \
root@$HOST_IP "cp /root/images/guest1.qcow2 /root/"