X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Fenvs%2Fcyclictest.sh;h=d1ae5c7fab550f736b2874f77266106fdf2318f5;hb=b49cecbe031d91c0267fef8a2925e72c86f1e6a3;hp=8f09930323db43c5028a21f3df5072cfe4f77f46;hpb=a5808cbda1855d72a3c360c85980c4fdd9d1ffc0;p=kvmfornfv.git

diff --git a/ci/envs/cyclictest.sh b/ci/envs/cyclictest.sh
index 8f0993032..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/"
@@ -30,7 +38,7 @@ function updateConfDaily() {
    DISPATCHER_TYPE=influxdb
    DISPATCHER_FILE_NAME="/tmp/yardstick.out"
    # Use the influxDB on the jumping server
-   DISPATCHER_INFLUXDB_TARGET="http://10.2.117.21:8086"
+   DISPATCHER_INFLUXDB_TARGET="http://104.197.68.199:8086"
    mkdir -p /etc/yardstick
    cat << EOF > /etc/yardstick/yardstick.conf
 [DEFAULT]
@@ -43,8 +51,8 @@ file_name = ${DISPATCHER_FILE_NAME}
 [dispatcher_influxdb]
 timeout = 5
 db_name = yardstick
-username = root
-password = root
+username = opnfv
+password = 0pnfv2015
 target = ${DISPATCHER_INFLUXDB_TARGET}
 EOF
 }