diff options
| author |   kalyanreddy <reddyx.gundarapu@intel.com> | 2017-03-17 11:09:07 +0530 |
|---|---|---|
| committer | Kalyan reddy Gundarapu <reddyx.gundarapu@intel.com> | 2017-03-17 07:07:11 +0000 |
| commit | 96e7a4ce5a4d186ed8297af9fd4333c510f2b9a1 (patch) | |
| tree | de5bffec1513886731413b51df6f8dc1c149344a /ci/test_kvmfornfv.sh | |
| parent | a9df9f4fdafc08c33d1debd0e4999e58cdbf4b31 (diff) | |
This patch includes updated scripts to use different docker containers
for each test case and perform necessary clean up operations after
execution of test cases.
Revert "Revert "This patch includes updated scripts for modifying""
This reverts commit 53bf71ea043426dd23319bd3bd011fd9a8ce0446
Note: This is only a temporary workaround. Will push the fix soon.
Change-Id: I6f3ef551bd8fb0b2c53ea2b3f4ee4bcf45dcdc7a
Co-Authored-By: RajithaY<rajithax.yerrumsetty@intel.com>
Signed-off-by: Gundarapu Kalyan Reddy <reddyx.gundarapu@intel.com>
Diffstat (limited to 'ci/test_kvmfornfv.sh')
| -rwxr-xr-x | ci/test_kvmfornfv.sh | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/ci/test_kvmfornfv.sh b/ci/test_kvmfornfv.sh index 11ea3a5ce..27419232e 100755 --- a/ci/test_kvmfornfv.sh +++ b/ci/test_kvmfornfv.sh @@ -60,15 +60,8 @@ 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 cyclictest_result=`expr ${cyclictest_result} + 0` @@ -78,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 @@ -147,8 +137,6 @@ if [ ${test_type} == "verify" ];then cyclictest ${env} sleep 10 done - env_clean - host_clean #Execution of packet forwarding test cases. packetForward fi @@ -194,8 +182,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" |