Merge "This patch contains scripts to decrease the time taken for the execution of...

diff --git a/ci/cyclicTestTrigger.sh b/ci/cyclicTestTrigger.sh
index 0e9d04a..d8370fd 100755 (executable)
--- a/ci/cyclicTestTrigger.sh
+++ b/ci/cyclicTestTrigger.sh
@@ -34,12 +34,13 @@ function updateYaml {
    cd $WORKSPACE/tests/
    sed -ri "s/[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}/${HOST_IP}/" pod.yaml
    sed -ri "s/loops: [0-9]*/loops: ${testTime}/"  cyclictest-node-context.yaml
-   sed -ri "s/interval: [0-9]*/interval: 1000/"  cyclictest-node-context.yaml
+   sed -ri "0,/interval: [0-9]*/s//interval: 1000/"  cyclictest-node-context.yaml
 }
 
 #cleaning the environment after executing the test through yardstick.
 function env_clean {
     container_id=`sudo docker ps -a | grep kvmfornfv_${testType} |awk '{print \$1}'|sed -e 's/\r//g'`
+    sudo docker stop ${container_id}
     sudo docker rm ${container_id}
     sudo ssh root@${HOST_IP} "rm -rf /root/workspace/*"
     sudo ssh root@${HOST_IP} "pid=\$(ps aux | grep 'qemu' | awk '{print \$2}' | head -1); echo \$pid |xargs kill"