X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2FcyclicTestTrigger.sh;h=6241452a206d00aad9da9f88a008ed6eaa579af2;hb=f2e379228d244be691bee350da1cb3d820cb6dfb;hp=0e9d04a5439274764355c4d7f91c9ec8c808dae6;hpb=15f48a2a1322a8dae448031ea2372d05dbf84731;p=kvmfornfv.git

diff --git a/ci/cyclicTestTrigger.sh b/ci/cyclicTestTrigger.sh
index 0e9d04a54..6241452a2 100755
--- a/ci/cyclicTestTrigger.sh
+++ b/ci/cyclicTestTrigger.sh
@@ -29,17 +29,18 @@ function verifyGuestImage {
    fi
 }
 
-#Updating the pod.yaml file with HOST_IP,cyclictest-node-context.yaml with loops and interval
+#Updating the pod.yaml file with HOST_IP,kvmfornfv_cyclictest_idle_idle.yaml with loops and interval
 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 "s/loops: [0-9]*/loops: ${testTime}/"  kvmfornfv_cyclictest_idle_idle.yaml
+   sed -ri "0,/interval: [0-9]*/s//interval: 1000/"  kvmfornfv_cyclictest_idle_idle.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"
@@ -82,7 +83,7 @@ function runCyclicTest {
    #copying required files to run yardstick cyclic testcase
    mv $WORKSPACE/build_output/kernel-${KERNELRPM_VERSION}*.rpm ${volume}/rpm
    cp -r $WORKSPACE/ci/envs/* ${volume}/scripts
-   cp -r $WORKSPACE/tests/cyclictest-node-context.yaml ${volume}
+   cp -r $WORKSPACE/tests/kvmfornfv_cyclictest_idle_idle.yaml ${volume}
    cp -r $WORKSPACE/tests/pod.yaml ${volume}/scripts
 
    #Launching ubuntu docker container to run yardstick