From: Yunhong Jiang <yunhong.jiang@linux.intel.com>
Date: Fri, 12 Aug 2016 00:09:51 +0000 (+0000)
Subject: Merge "Revert the test_kvmfornfv.sh"
X-Git-Tag: colorado.1.0~14
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?p=kvmfornfv.git;a=commitdiff_plain;h=1f0befb721c82e39c4839a552b3933f417317e00;hp=00bbca23ecc68278a7ef090e7e073b4e9736208e

Merge "Revert the test_kvmfornfv.sh"
---

diff --git a/ci/test_kvmfornfv.sh b/ci/test_kvmfornfv.sh
old mode 100644
new mode 100755
index a33814907..70961d748
--- a/ci/test_kvmfornfv.sh
+++ b/ci/test_kvmfornfv.sh
@@ -1,44 +1,12 @@
 #!/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
-
-time_stamp=$(date +%Y%m%d%H%M%S)
-mkdir -p /tmp/kvmtest-${time_stamp}/{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
-
-#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
-
-#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
-    echo "####################################################"
-    echo ""
-    echo `grep -o '"data":[^}]*' $volume/yardstick.out | awk -F '{' '{print $2}'`
-    echo ""
-    echo "####################################################"
-    exit 0
-else
-    echo "Testcase failed"
-    echo `grep -o '"errors":[^,]*' $volume/yardstick.out | awk -F '"' '{print $4}'`
-    exit 1
-fi
+echo "Hello world"