X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Ftest_kvmfornfv.sh;h=858aaf3947f5b5a07435e9575323e7964fe07250;hb=b8f6485d5a5c66f0fce566e59b8b5891c6a7f571;hp=45d1ea25288d9e5b93c4ed4817fcd83e9e38e681;hpb=42e2343970d47d0aa081a565c0f51873778e555c;p=kvmfornfv.git

diff --git a/ci/test_kvmfornfv.sh b/ci/test_kvmfornfv.sh
index 45d1ea252..858aaf394 100755
--- a/ci/test_kvmfornfv.sh
+++ b/ci/test_kvmfornfv.sh
@@ -1,54 +1,33 @@
 #!/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.
 ############################################################
+## This script  is an interface to trigger the
+## cyclicTestTrigger.sh for test type like patch verification,
+## daily testing.
+## Releng will trigger this script by passing test type like
+## verify/daily as an argument
+############################################################
+
+test_type=$1
+
+if [ ${test_type} == "verify" ];then
+   HOST_IP="10.2.117.23"
+   test_time=600000 # 10m
+elif [ ${test_type} == "daily" ];then
+   HOST_IP="10.2.117.25"
+   test_time=7200000 #2h
+elif [ ${test_type} == "merge" ];then
+   echo "Test is not enabled for ${test_type}"
+   exit 0
+fi
 
+source $WORKSPACE/ci/cyclicTestTrigger.sh $HOST_IP $test_time $test_type
 
-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-*
-}
+#Update cyclictest-node-context.yaml with test_time and pod.yaml with IP
+updateYaml
 
 #Cleaning up the test environment before running cyclictest through yardstick.
 env_clean
 
-time_stamp=$(date +%Y%m%d%H%M%S)
-volume=/tmp/kvmtest-${time_stamp}
-mkdir -p $volume/{image,rpm,scripts}
-
-#copying required files to run yardstick cyclic testcase
-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 -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}'`
-
-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}'`
-    env_clean
-    exit 1
-fi
+#Creating a docker image with yardstick installed and launching ubuntu docker to run yardstick cyclic testcase
+runCyclicTest