Commit ecaed3ac authored by Fang-WANG's avatar Fang-WANG

modify case

parent f401bf21
...@@ -328,7 +328,6 @@ pipeline { ...@@ -328,7 +328,6 @@ pipeline {
} }
} }
} }
*/
stage ("Test basic simulator") { stage ("Test basic simulator") {
when { when {
expression {doMandatoryTests} expression {doMandatoryTests}
...@@ -349,7 +348,7 @@ pipeline { ...@@ -349,7 +348,7 @@ pipeline {
} }
} }
} }
/* stage ("Test L1 simulator") { stage ("Test L1 simulator") {
when { when {
expression {doMandatoryTests} expression {doMandatoryTests}
} }
...@@ -389,6 +388,7 @@ pipeline { ...@@ -389,6 +388,7 @@ pipeline {
} }
} }
} }
*/
stage ("Test 5G RF simulator") { stage ("Test 5G RF simulator") {
when { when {
expression {doMandatoryTests} expression {doMandatoryTests}
...@@ -409,6 +409,7 @@ pipeline { ...@@ -409,6 +409,7 @@ pipeline {
} }
} }
} }
/*
stage ("Test L2 simulator") { stage ("Test L2 simulator") {
when { when {
expression {doFullTestsuite} expression {doFullTestsuite}
......
...@@ -41,31 +41,6 @@ function destroy_vm { ...@@ -41,31 +41,6 @@ function destroy_vm {
LIST_CI_VM=`uvt-kvm list | grep $VM_TEMPLATE` LIST_CI_VM=`uvt-kvm list | grep $VM_TEMPLATE`
if [ $LIST_CI_VM -eq 0 ]
then
echo "############################################################"
echo "uvt-kvm list | grep $VM_TEMPLATE, retry 1 "
echo "############################################################"
LIST_CI_VM=`uvt-kvm list | grep $VM_TEMPLATE`
fi
if [ $LIST_CI_VM -eq 0 ]
then
echo "############################################################"
echo "uvt-kvm list | grep $VM_TEMPLATE, retry 2 "
echo "############################################################"
LIST_CI_VM=`uvt-kvm list | grep $VM_TEMPLATE`
fi
if [ $LIST_CI_VM -eq 0 ]
then
echo "############################################################"
echo "uvt-kvm list | grep $VM_TEMPLATE, retry 3 "
echo "############################################################"
LIST_CI_VM=`uvt-kvm list | grep $VM_TEMPLATE`
fi
for CI_VM in $LIST_CI_VM for CI_VM in $LIST_CI_VM
do do
VM_IP_ADDR=`uvt-kvm ip $CI_VM` VM_IP_ADDR=`uvt-kvm ip $CI_VM`
......
...@@ -57,30 +57,6 @@ function wait_on_vm_build { ...@@ -57,30 +57,6 @@ function wait_on_vm_build {
IS_VM_ALIVE=`uvt-kvm list | grep -c $VM_NAME` IS_VM_ALIVE=`uvt-kvm list | grep -c $VM_NAME`
if [ $IS_VM_ALIVE -eq 0 ]
then
echo "############################################################"
echo "uvt-kvm list | grep -c $VM_NAME error,retry 1 "
echo "############################################################"
IS_VM_ALIVE=`uvt-kvm list | grep -c $VM_NAME`
fi
if [ $IS_VM_ALIVE -eq 0 ]
then
echo "############################################################"
echo "uvt-kvm list | grep -c $VM_NAME error,retry 2 "
echo "############################################################"
IS_VM_ALIVE=`uvt-kvm list | grep -c $VM_NAME`
fi
if [ $IS_VM_ALIVE -eq 0 ]
then
echo "############################################################"
echo "uvt-kvm list | grep -c $VM_NAME error,retry 3 "
echo "############################################################"
IS_VM_ALIVE=`uvt-kvm list | grep -c $VM_NAME`
fi
if [ $IS_VM_ALIVE -eq 0 ] if [ $IS_VM_ALIVE -eq 0 ]
then then
echo "############################################################" echo "############################################################"
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment