From 9bc4b7ed01d2035bf8fb07e72b2ad4bd140bb9da Mon Sep 17 00:00:00 2001 From: kinkwan_tsui Date: Thu, 30 May 2019 00:25:14 +0300 Subject: [PATCH] update pkill helm to each script Change-Id: Ide879491f1790451f80280aa42871ba9f300f6c2 Signed-off-by: kinkwan_tsui --- workflows/nanobot.sh | 5 ++++- workflows/ric_automation.sh | 4 ++++ workflows/robot_test_ric.sh | 3 +++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/workflows/nanobot.sh b/workflows/nanobot.sh index dc02070..ba13b4b 100755 --- a/workflows/nanobot.sh +++ b/workflows/nanobot.sh @@ -57,9 +57,12 @@ helm install localric/nanobot --namespace rictest --name nanobot nanobot_pod=$(kubectl get pods -n rictest -o go-template --template '{{range .items}}{{.metadata.name}}{{"\n"}}{{end}}') sleep 10 kubectl logs $nanobot_pod -n rictest - +#--------------kill helm--------------------------------------------------------------------- +pkill helm #------------checking the status of the rictest pod-------------------------------------- command="$(kubectl get po --no-headers --namespace=rictest --field-selector status.phase=Completed 2> /dev/null)" if [[ $command != "" ]]; then exit 1 fi + + diff --git a/workflows/ric_automation.sh b/workflows/ric_automation.sh index fbb39f9..46768e6 100755 --- a/workflows/ric_automation.sh +++ b/workflows/ric_automation.sh @@ -125,8 +125,12 @@ sed -i 's,http://127.0.0.1:8879,http://127.0.0.1:8879/charts,g' "ric_install.sh" sed -i 's,local,localric,g' "ric_install.sh" bash -x ./ric_install.sh +#--------------kill helm--------------------------------------------------------------------- +pkill helm #-------------checking the output------------------------------------------------------------- command="$(kubectl get po --no-headers --namespace=ricplatform --field-selector status.phase!=Running 2> /dev/null)" if [[ $command != "" ]]; then exit 1 fi + + diff --git a/workflows/robot_test_ric.sh b/workflows/robot_test_ric.sh index d16e8a3..fff75eb 100755 --- a/workflows/robot_test_ric.sh +++ b/workflows/robot_test_ric.sh @@ -55,8 +55,11 @@ kubectl exec -n ricplatform -it $ric_robot_pod -- sed -i '17,19 s/^/#/' /var/opt #---------show the test cases------------------------------ cd /home/cloudadmin/RIC/test/ric_robot_suite/helm/ric-robot/ bash ete-k8s.sh ricplatform health +#--------------kill helm--------------------------------------------------------------------- +pkill helm #----------checking the status of the pods------------------ command="$(kubectl get po --no-headers --namespace=ricplatform --field-selector status.phase!=Running 2> /dev/null)" if [[ $command != "" ]]; then exit 1 fi + -- 2.16.6