X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=ci%2FcyclicTestTrigger.sh;h=4bb8fe5d4e01b0abacbe7409002918b6bf36015f;hb=868367c47df84a70a49f7be6b5e6c3150906aa8f;hp=640a0738ad54cc75de4e5bb45d3cbd2f5b1a1471;hpb=b1495d4fa3175a3ffea301dedb9b0a60ca9ada44;p=kvmfornfv.git

diff --git a/ci/cyclicTestTrigger.sh b/ci/cyclicTestTrigger.sh
index 640a0738a..4bb8fe5d4 100755
--- a/ci/cyclicTestTrigger.sh
+++ b/ci/cyclicTestTrigger.sh
@@ -41,7 +41,6 @@ function verifyGuestImage {
 
 #disabling ftrace and collecting the logs to upload to artifact repository.
 function ftrace_disable {
-   sudo ssh root@${HOST_IP} "sh /root/workspace/scripts/disable_trace.sh"
    sudo ssh root@${HOST_IP} "cd /tmp ;  mv trace.txt cyclictest_${env}.txt"
    mkdir -p $WORKSPACE/build_output/log/kernel_trace
    scp root@${HOST_IP}:/tmp/cyclictest_${env}.txt $WORKSPACE/build_output/log/kernel_trace/
@@ -140,15 +139,15 @@ function cleanup {
    fi
 }
 
-#environment setup for executing packet forwarding test cases
-function setUpPacketForwarding {
-   #copying required files to run packet forwarding test cases
+function nodeSetup {
+   #copying required files to run kvmfornfv testcases
    ssh root@$HOST_IP "mkdir -p /root/workspace/image"
    ssh root@$HOST_IP "mkdir -p /root/workspace/rpm"
    ssh root@$HOST_IP "mkdir -p /root/workspace/scripts"
    #Copying the host configuration scripts on to host
    scp -r $WORKSPACE/ci/envs/* root@$HOST_IP:/root/workspace/scripts
    scp -r $WORKSPACE/tests/vsperf.conf* root@$HOST_IP:/root/workspace/scripts
+   scp -r $WORKSPACE/tests/pod.yaml root@$HOST_IP:/root/workspace/scripts
    scp -r $WORKSPACE/build_output/kernel-${KERNELRPM_VERSION}*.rpm root@$HOST_IP:/root/workspace/rpm
    scp -r $WORKSPACE/build_output/kernel-devel-${KERNELRPM_VERSION}*.rpm root@$HOST_IP:/root/workspace/rpm
    scp -r $WORKSPACE/build_output/qemu-${QEMURPM_VERSION}*.rpm root@$HOST_IP:/root/workspace/rpm
@@ -159,6 +158,12 @@ function setUpPacketForwarding {
    sleep 10
 }
 
+#environment setup for executing packet forwarding test cases
+function setUpPacketForwarding {
+   echo "Copying required files to execute packet forwarding test case"
+   nodeSetup
+}
+
 #executing packet forwarding test cases
 function runPacketForwarding {
    testType=$1
@@ -189,15 +194,16 @@ 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
 
    #Disabling ftrace after completion of executing test cases.
    if [ ${ftrace_enable} -eq '1' ]; then
       ftrace_disable
    fi
 
+   if [ "$testName" == "memorystress_idle" ];then
+      copyLogs
+   fi
+
    #Verifying the results of cyclictest
    if [ "$testType" == "verify" ];then
       result=`grep -o '"errors":[^,]*' ${volume}/yardstick.out | awk -F '"' '{print $4}'`
@@ -220,3 +226,24 @@ function runCyclicTest {
       cleanup $cyclictest_output
    fi
 }
+function runLiveMigration {
+   test_env=$1
+   if [ ${test_env} == "peer-peer" ];then
+      echo "live migration is not implemented for peer to peer"
+   else
+      echo "In runLiveMigration Function"
+      echo "Copying required files to execute live migration"
+      nodeSetup
+      connect_host
+      sleep 15
+      echo " Displaying the number of huge pages on node"
+      ssh root@$HOST_IP "cd /root/workspace/scripts;cat /sys/devices/system/node/node1/hugepages/hugepages-1048576kB/nr_hugepages"
+      echo " Displaying the free huge pages on node"
+      ssh root@$HOST_IP "cd /root/workspace/scripts;cat /sys/devices/system/node/node1/hugepages/hugepages-1048576kB/nr_hugepages"
+      ssh root@$HOST_IP "cd /root/workspace/scripts ; ./host-setup1.sh"
+      echo "Setting up ovs-dpdk on the host"
+      ssh root@$HOST_IP "cd /root/workspace/scripts ; ./setup_ovsdpdk.sh"
+      ssh root@$HOST_IP "cd /root/workspace/scripts ; ./host-install-qemu.sh"
+      ssh root@$HOST_IP "cd /root/workspace/scripts ; ./host-run-livemigration.sh"
+  fi
+}