X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Ftest_kvmfornfv.sh;h=fd29f6d43c37153f22787352bfc0637bd7a13659;hb=3dbc3510f0107b73c1d3943937218d2dcf5353b3;hp=a338149071ffa4a2f136e98993c28418436f93ae;hpb=0d6af5dda5ef996f7a32a4ef4af84a3a67bd96e0;p=kvmfornfv.git

diff --git a/ci/test_kvmfornfv.sh b/ci/test_kvmfornfv.sh
old mode 100644
new mode 100755
index a33814907..fd29f6d43
--- a/ci/test_kvmfornfv.sh
+++ b/ci/test_kvmfornfv.sh
@@ -6,39 +6,75 @@
 ## and verifies the test results.
 ############################################################
 
-volume=/tmp/kvmtest-*
-if [ -d ${volume} ] ; then
-    echo "Directory '${volume}' exists"
-    sudo rm -rf ${volume}
+source $WORKSPACE/ci/envs/utils.sh
+HOST_IP=$( getHostIP )
+KERNEL_VERSION=$( getKernelVersion )
+if [ -z $KERNEL_VERSION ];then
+   echo "Kernel RPM not found in $WORKSPACE/build_output Directory"
+   exit 1
+fi
+
+docker_image_dir=$WORKSPACE/docker_image_build
+function env_clean {
+    container_id=`sudo docker ps -a | grep kvmfornfv |awk '{print $1}'|sed -e 's/\r//g'`
+    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"
+    sudo rm -rf /tmp/kvmtest-*
+}
+
+function host_clean {
+    sudo ssh root@$HOST_IP "rpm=\$(rpm -qa | grep 'kernel-${KERNEL_VERSION}' | awk '{print \$1}'); rpm -ev \$rpm"
+    sudo ssh root@$HOST_IP "rm -rf /boot/initramfs-${KERNEL_VERSION}*.img"
+    sudo ssh root@$HOST_IP "grub2-mkconfig -o /boot/grub2/grub.cfg"
+    sudo ssh root@$HOST_IP "reboot"
+}
+
+#Cleaning up the test environment before running cyclictest through yardstick.
+env_clean
+
+#Creating a docker image with yardstick installed.
+( cd ${docker_image_dir}; sudo docker build  -t kvmfornfv:latest --no-cache=true . )
+if [ ${?} -ne 0 ] ; then
+    echo  "Docker image build failed"
+    id=$(sudo docker ps -a  | head  -2 | tail -1 | awk '{print $1}'); sudo docker rm -f $id
+    exit 1
 fi
 
 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-${KERNEL_VERSION}*.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 "####################################################"
+    #cleaning the environment after executing the test through yardstick.
+    env_clean
+    #Cleaning the latest kernel changes on host after executing the test.
+    host_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}'`
+    #cleaning the environment after executing the test through yardstick.
+    env_clean
+    #Cleaning the latest kernel changes on host after executing the test.
+    host_clean
     exit 1
 fi