summaryrefslogtreecommitdiffstats
path: root/ci/test_kvmfornfv.sh
diff options
context:
space:
mode:
Diffstat (limited to 'ci/test_kvmfornfv.sh')
-rwxr-xr-xci/test_kvmfornfv.sh18
1 files changed, 13 insertions, 5 deletions
diff --git a/ci/test_kvmfornfv.sh b/ci/test_kvmfornfv.sh
index 874dc9864..09bba8149 100755
--- a/ci/test_kvmfornfv.sh
+++ b/ci/test_kvmfornfv.sh
@@ -19,6 +19,7 @@ cyclictest_env_daily=("idle_idle" "cpustress_idle" "memorystress_idle" "iostress
cyclictest_result=0 #exit code of cyclictest
packetforward_result=0 #exit code of packet forward
lm_env_verify=("peer-peer" "local")
+livemigration_result=0 #exit code of livemigration
source $WORKSPACE/ci/envs/host-config
#check if any kernel rpms available for testing
@@ -53,20 +54,26 @@ function packetForward {
exit 1
fi
}
+
function liveMigration {
#executing live migration test case on the host machine
test_env=$1
+ test_name=livemigration
echo "Test Environment ${test_env}"
if [ ${test_env} == "peer-peer" ];then
echo "live migration is not implemented for peer to peer"
- livemigration_result=0
elif [ ${test_env} == "local" ];then
source $WORKSPACE/ci/cyclicTestTrigger.sh $HOST_IP
connect_host
+ env_clean
#Waiting for ssh to be available for the host machine.
sleep 20
- runLiveMigration ${test_env}
- livemigration_result=$?
+ if runLiveMigration ${test_env} ${test_name};then
+ livemigration_result=`expr ${livemigration_result} + 0`
+ else
+ echo "live migration test case failed"
+ livemigration_result=`expr ${livemigration_result} + 1`
+ fi
else
echo "Incorrect test environment for live migration"
exit 1
@@ -80,6 +87,7 @@ function getTestParams {
function cyclictest {
test_case=$1
+ test_name=cyclictest
source $WORKSPACE/ci/cyclicTestTrigger.sh $HOST_IP $test_time $test_type $test_case
#Verifying whether the test node is up and running
connect_host
@@ -96,7 +104,7 @@ function cyclictest {
#Cleaning the environment before running cyclictest through yardstick
env_clean
#Creating a docker image with yardstick installed and launching ubuntu docker to run yardstick cyclic testcase
- if runCyclicTest ${ftrace_enable};then
+ if runCyclicTest ${ftrace_enable} ${test_name};then
cyclictest_result=`expr ${cyclictest_result} + 0`
else
echo "Test case execution FAILED for ${test_case} environment"
@@ -166,7 +174,7 @@ if [ ${test_type} == "verify" ];then
liveMigration ${envi}
done
fi
- if [ ${cyclictest_result} -ne 0 ] || [ ${packetforward_result} -ne 0 ];then
+ if [ ${cyclictest_result} -ne 0 ] || [ ${packetforward_result} -ne 0 ] || [ ${livemigration_result} -ne 0 ];then
echo "Test case FAILED"
test_exit 1
else