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

diff --combined ci/cyclicTestTrigger.sh
index 0e9d04a,8a805e9..d8370fd
--- 1/ci/cyclicTestTrigger.sh
--- 2/ci/cyclicTestTrigger.sh
+++ b/ci/cyclicTestTrigger.sh
@@@ -34,12 -34,13 +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"
@@@ -54,17 -55,6 +55,17 @@@ function host_clean 
      sudo ssh root@${HOST_IP} "reboot"
  }
  
 +function cleanup {
 +   output=$1
 +   env_clean
 +   host_clean
 +   if [ $output != 0 ];then
 +      echo "Yardstick Failed.Please check cyclictest.sh"
 +      return 1
 +   else
 +      return 0
 +   fi
 +}
  
  #Creating a docker image with yardstick installed and Verify the results of cyclictest
  function runCyclicTest {
@@@ -87,28 -77,30 +88,28 @@@
  
     #Launching ubuntu docker container to run yardstick
     sudo docker run -i -v ${volume}:/opt --net=host --name kvmfornfv_${testType} \
 -   kvmfornfv:latest  /bin/bash -c "cd /opt/scripts && ls; ./cyclictest.sh"
 -   output=$?
 +   kvmfornfv:latest  /bin/bash -c "cd /opt/scripts && ls; ./cyclictest.sh $testType"
 +   cyclictest_output=$?
     #Verifying the results of cyclictest
 -   result=`grep -o '"errors":[^,]*' ${volume}/yardstick.out | awk -F '"' '{print $4}'`
  
 -   if [ -z "${result}" ]; then
 -      echo "####################################################"
 -      echo ""
 -      echo `grep -o '"data":[^}]*' ${volume}/yardstick.out | awk -F '{' '{print $2}'`
 -      echo ""
 -      echo "####################################################"
 -      env_clean
 -      host_clean
 -      if [ $output != 0 ];then
 -         echo "Some problem with Yardstick.Check cyclictest.sh"
 -         return 1
 +   if [ "$testType" == "verify" ];then
 +      result=`grep -o '"errors":[^,]*' ${volume}/yardstick.out | awk -F '"' '{print $4}'`
 +
 +      if [ -z "${result}" ]; then
 +         echo "####################################################"
 +         echo ""
 +         echo `grep -o '"data":[^}]*' ${volume}/yardstick.out | awk -F '{' '{print $2}'`
 +         echo ""
 +         echo "####################################################"
 +         cleanup $cyclictest_output
        else
 -         return 0
 +         echo "Testcase failed"
 +         echo `grep -o '"errors":[^,]*' ${volume}/yardstick.out | awk -F '"' '{print $4}'`
 +         env_clean
 +         host_clean
 +         return 1
        fi
     else
 -      echo "Testcase failed"
 -      echo `grep -o '"errors":[^,]*' ${volume}/yardstick.out | awk -F '"' '{print $4}'`
 -      env_clean
 -      host_clean
 -      return 1
 +      cleanup $cyclictest_output
     fi
  }