This patch contains the PCM utility installation and continously

[kvmfornfv.git] / ci / cyclicTestTrigger.sh

diff --git a/ci/cyclicTestTrigger.sh b/ci/cyclicTestTrigger.sh
index d222ae1..14aafbe 100755 (executable)
--- a/ci/cyclicTestTrigger.sh
+++ b/ci/cyclicTestTrigger.sh
@@ -13,6 +13,7 @@ testType=$3
 testName=$4
 
 source $WORKSPACE/ci/envs/utils.sh
+source $WORKSPACE/ci/envs/host-config
 KERNELRPM_VERSION=$( getKernelVersion )
 QEMURPM_VERSION=$( getQemuVersion )
 
@@ -35,6 +36,29 @@ function verifyGuestImage {
    fi
 }
 
+#Verifying the availability of the host after reboot
+function connect_host {
+   n=0
+   while [ $n -lt 25 ]; do
+      host_ping_test="ping -c 1 ${HOST_IP}"
+      eval $host_ping_test &> /dev/null
+      if [ ${?} -ne 0 ] ; then
+         sleep 10
+         echo "host machine is still under reboot..trying to connect...."
+         n=$(($n+1))
+      else
+         echo "resuming the execution of test cases....."
+         #Waiting for ssh to be available for the host machine.
+         sleep 30
+         break
+      fi
+      if [ $n == 24 ];then
+         echo "Host machine unable to boot-up!"
+         exit 1
+      fi
+   done
+}
+
 #Updating the pod.yaml file with HOST_IP,kvmfornfv_cyclictest_idle_idle.yaml with loops and interval
 function updateYaml {
    cd $WORKSPACE/tests/
@@ -110,7 +134,7 @@ function runCyclicTest {
    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
+      err_exit 1
    fi
    time_stamp=$(date +%Y%m%d%H%M%S)
    volume=/tmp/kvmtest-${testType}-${time_stamp}
@@ -127,8 +151,10 @@ function runCyclicTest {
    sudo docker run -i -v ${volume}:/opt --net=host --name kvmfornfv_${testType}_${testName} \
    kvmfornfv:latest  /bin/bash -c "cd /opt/scripts && ls; ./cyclictest.sh $testType $testName"
    cyclictest_output=$?
+   if [ "$testName" == "iostress_idle" ];then
+      copyLogs
+   fi
    #Verifying the results of cyclictest
-
    if [ "$testType" == "verify" ];then
       result=`grep -o '"errors":[^,]*' ${volume}/yardstick.out | awk -F '"' '{print $4}'`