X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fenvs%2Fcyclictest.sh;h=d1ae5c7fab550f736b2874f77266106fdf2318f5;hb=7ea7eea6dab8c1b40c2626eead4ced80e77f87b9;hp=805f9088ffe98967cf047dd62e64a377a70c627f;hpb=ff067418f34c3670cbab67587d8ab0dc0c8f1acc;p=kvmfornfv.git

diff --git a/ci/envs/cyclictest.sh b/ci/envs/cyclictest.sh
index 805f9088f..d1ae5c7fa 100755
--- a/ci/envs/cyclictest.sh
+++ b/ci/envs/cyclictest.sh
@@ -7,9 +7,11 @@
 source utils.sh
 
 testType=$1 #daily/verify/merge
+testName=$2 #idle_idle/stress_idle
 HOST_IP=$( getHostIP )
 pod_config='/opt/scripts/pod.yaml'
-cyclictest_context_file='/opt/kvmfornfv_cyclictest_idle_idle.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"
@@ -21,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/"