X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2Ftest_kvmfornfv.sh;h=8199bf0e95ed9b73c947300ac7bd41b6c4868652;hb=f835f6520f491d554fa9655efe9e52dd8153c352;hp=adf0aa3ce5bdd669248454a242b73c008b7bff8c;hpb=af712826966ee75ba5ac466a6c192580abdf0c29;p=kvmfornfv.git

diff --git a/ci/test_kvmfornfv.sh b/ci/test_kvmfornfv.sh
index adf0aa3ce..8199bf0e9 100755
--- a/ci/test_kvmfornfv.sh
+++ b/ci/test_kvmfornfv.sh
@@ -21,13 +21,27 @@ packetforward_result=0 #exit code of packet forward
 source $WORKSPACE/ci/envs/host-config
 
 function packetForward {
-#   source $WORKSPACE/ci/packet_forward_test.sh $HOST_IP
-   echo "Packetforwarding need to be implemented"
-   packetforward_result=$?
-   if [ ${packetforward_result} -ne 0 ];then
-      echo "Packet Forwarding test case execution FAILED"
+   #executing packet forwarding test cases based on the job type.
+   if [ ${test_type} == "verify" ];then
+      echo "packet forwarding test cases are not yet implemented for verify job"
+      packetforward_result=0
+   elif [ ${test_type} == "daily" ];then
+      source $WORKSPACE/ci/cyclicTestTrigger.sh $HOST_IP
+      connect_host
+      #Waiting for ssh to be available for the host machine.
+      sleep 20
+      # copy files and rpms and setup environment required for executing test cases
+      setUpPacketForwarding
+      sleep 1
+      #Verifying whether the test node is up and running
+      connect_host
+      sleep 20
+      #Install and Execute packet forwarding test cases
+      runPacketForwarding $test_type
+      packetforward_result=$?
    else
-      echo "Packet Forwarding test case executed SUCCESSFULLY"
+      echo "Incorrect test type ${test_type}"
+      exit 1
    fi
 }
 
@@ -46,17 +60,10 @@ function cyclictest {
    updateYaml
    #Running PCM utility
    collect_MBWInfo $test_type
-   #Checking which test cases will be executed first and last from the list to perform cleaning operations.
-   first_test_case=cyclictest_env_$test_type[0]
-   last_test_case=cyclictest_env_$test_type[-1]
    #Cleaning the environment before running cyclictest through yardstick
-   if [ ${test_case} == "${!first_test_case}" ];then
-      env_clean
-   else
-      sudo ssh root@${HOST_IP} "pid=\$(ps aux | grep 'qemu' | awk '{print \$2}' | head -1); echo \$pid |xargs kill"
-   fi
+   env_clean
    #Creating a docker image with yardstick installed and launching ubuntu docker to run yardstick cyclic testcase
-   if runCyclicTest;then
+   if runCyclicTest ${ftrace_enable};then
       cyclictest_result=`expr ${cyclictest_result} + 0`
    else
       echo "Test case execution FAILED for ${test_case} environment"
@@ -64,9 +71,6 @@ function cyclictest {
    fi
    echo "Terminating PCM Process"
    sudo ssh root@${HOST_IP} "pid=\$(ps aux | grep 'pcm' | awk '{print \$2}' | head -1); echo \$pid |xargs kill -SIGTERM"
-   if [ ${test_case} != "${!last_test_case}" ];then
-      sudo ssh root@${HOST_IP} "reboot"
-   fi
 }
 function collect_MBWInfo {
    #Collecting the Memory Bandwidth Information using pcm-memory utility
@@ -101,13 +105,6 @@ function install_pcm {
    '
 }
 
-function ftrace_disable {
-   sudo ssh root@${HOST_IP} "sh /root/workspace/scripts/disbale-trace.sh"
-   sudo ssh root@${HOST_IP} "cd /tmp ; a=\$(ls -rt | tail -1) ; echo \$a ; mv \$a cyclictest_${env}.txt"
-   sudo mkdir -p $WORKSPACE/build_output/log/kernel_trace
-   sudo scp root@${HOST_IP}:/tmp/cyclictest_${env}.txt $WORKSPACE/build_output/log/kernel_trace/
-}
-
 #Execution of testcases based on test type and test name from releng.
 if [ ${test_type} == "verify" ];then
    HOST_IP="10.10.100.21"
@@ -117,11 +114,9 @@ if [ ${test_type} == "verify" ];then
       for env in ${cyclictest_env_verify[@]}
       do
          #Enabling ftrace for kernel debugging.
-         sed -i '/host-setup1.sh/a\    \- \"enable-trace.sh\"' kvmfornfv_cyclictest_hostenv_guestenv.yaml
+         sed -i '/host-setup1.sh/a\    \- \"enable-trace.sh\"' $WORKSPACE/tests/kvmfornfv_cyclictest_hostenv_guestenv.yaml
          #Executing cyclictest through yardstick.
          cyclictest ${env}
-         #disabling ftrace and collecting the logs to upload to artifact repository.
-         ftrace_disable
          sleep 10
       done
       #Execution of packet forwarding test cases.
@@ -133,27 +128,31 @@ if [ ${test_type} == "verify" ];then
          cyclictest ${env}
          sleep 10
       done
-      env_clean
-      host_clean
       #Execution of packet forwarding test cases.
       packetForward
    fi
-      if [ ${cyclictest_result} -ne 0 ] ||  [ ${packetforward_result} -ne 0 ];then
-         echo "Test case FAILED"
-         test_exit 1
-      else
-         test_exit 0
-      fi
+   if [ ${cyclictest_result} -ne 0 ] ||  [ ${packetforward_result} -ne 0 ];then
+      echo "Test case FAILED"
+      test_exit 1
+   else
+      test_exit 0
+   fi
 elif [ ${test_type} == "daily" ];then
    HOST_IP="10.10.100.22"
    test_time=3600000 #1h
    install_pcm
    if [ ${test_name} == "packet_forward" ];then
       packetForward
+      packet_fwd_logs
+      #clean the test environment after the test case execution.
+      sudo ssh root@${HOST_IP} "rm -rf /root/workspace/*"
+      host_clean
       if [ ${packetforward_result} -ne 0 ] ; then
-         test_exit 1
+         echo "Execution of packet forwarding test cases FAILED"
+         packet_fwd_exit 1
       else
-         test_exit 0
+         echo "Executed packet forwarding test cases SUCCESSFULLY"
+         packet_fwd_exit 0
       fi
    elif [ ${test_name} == "cyclictest" ];then
       if [ ${ftrace_enable} -eq '1' ]; then
@@ -174,8 +173,6 @@ elif [ ${test_type} == "daily" ];then
          cyclictest ${env}
          sleep 5
          done
-         env_clean
-         host_clean
       fi
          if [ ${cyclictest_result} -ne 0 ] ; then
             echo "Cyclictest case execution FAILED"