X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Ftest_kvmfornfv.sh;h=45d1ea25288d9e5b93c4ed4817fcd83e9e38e681;hb=refs%2Fheads%2Fstable%2Fcolorado;hp=a338149071ffa4a2f136e98993c28418436f93ae;hpb=00bbca23ecc68278a7ef090e7e073b4e9736208e;p=kvmfornfv.git

diff --git a/ci/test_kvmfornfv.sh b/ci/test_kvmfornfv.sh
old mode 100644
new mode 100755
index a33814907..45d1ea252
--- a/ci/test_kvmfornfv.sh
+++ b/ci/test_kvmfornfv.sh
@@ -1,44 +1,54 @@
 #!/bin/bash
 
+#############################################################
+## !!! The original test_kvmfornfv.sh is removed because it
+## break the verification process!!!
 #############################################################
 ## This script  will launch ubuntu docker container
 ## runs cyclictest through yardstick
 ## and verifies the test results.
 ############################################################
 
-volume=/tmp/kvmtest-*
-if [ -d ${volume} ] ; then
-    echo "Directory '${volume}' exists"
-    sudo rm -rf ${volume}
-fi
+
+function env_clean {
+    container_id=`sudo docker ps -a | grep kvmfornfv |awk '{print $1}'`
+    sudo docker rm $container_id
+    sudo ssh root@10.2.117.23 "rm -rf /root/workspace/*"
+    sudo ssh root@10.2.117.23 "pid=\$(ps aux | grep 'qemu' | awk '{print \$2}' | head -1); echo \$pid |xargs kill"
+    sudo rm -rf /tmp/kvmtest-*
+}
+
+#Cleaning up the test environment before running cyclictest through yardstick.
+env_clean
 
 time_stamp=$(date +%Y%m%d%H%M%S)
-mkdir -p /tmp/kvmtest-${time_stamp}/{image,rpm,scripts}
+volume=/tmp/kvmtest-${time_stamp}
+mkdir -p $volume/{image,rpm,scripts}
 
 #copying required files to run yardstick cyclic testcase
-mv ${WORKSPACE}/build_output/* $volume/rpm
-cp ${WORKSPACE}/ci/envs/* $volume/scripts
-cp ${WORKSPACE}/tests/cyclictest-node-context.yaml $volume
-cp ${WORKSPACE}/tests/pod.yaml $volume
+mv $WORKSPACE/build_output/kernel-4.4*.rpm $volume/rpm
+cp -r $WORKSPACE/ci/envs/* $volume/scripts
+cp -r $WORKSPACE/tests/cyclictest-node-context.yaml $volume
+cp -r $WORKSPACE/tests/pod.yaml $volume
 
 #Launching ubuntu docker container to run yardstick
-sudo docker run -t -i -v $volume:/opt --net=host --name kvmfornfv \
-kvmfornfv:latest  /bin/bash /opt/scripts/cyclictest.sh
-container_id=`sudo docker ps -a | grep kvmfornfv |awk '{print $1}'`
-sudo docker rm $container_id
+sudo docker run -i -v $volume:/opt --net=host --name kvmfornfv \
+kvmfornfv:latest  /bin/bash -c "cd /opt/scripts && ls; ./cyclictest.sh"
 
 #Verifying the results of cyclictest
-result=`grep -o '"errors":[^,]*' $volume/yardstick.out | awk -F '"' \
-'{print $4}'| awk '{if (NF=0) print "SUCCESS" }'`
-if [ "$result" = "SUCCESS" ]; 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 "####################################################"
+    env_clean
     exit 0
 else
     echo "Testcase failed"
-    echo `grep -o '"errors":[^,]*' $volume/yardstick.out | awk -F '"' '{print $4}'`
+    echo `grep -o '"errors":[^,]*' ${volume}/yardstick.out | awk -F '"' '{print $4}'`
+    env_clean
     exit 1
 fi