Tiny fix for istio scenario

- disable user interactive when clean_bookinfo
- run sleep before status check to save ci varify time

Change-Id: I6072b85c3c941af30263101a3d4dca0537abf1fc
Signed-off-by: QiLiang <liangqi1@huawei.com>

diff --git a/src/vagrant/kubeadm_istio/istio/bookinfo.sh b/src/vagrant/kubeadm_istio/istio/bookinfo.sh
index b61ea4e..cc09167 100755 (executable)
--- a/src/vagrant/kubeadm_istio/istio/bookinfo.sh
+++ b/src/vagrant/kubeadm_istio/istio/bookinfo.sh
@@ -30,9 +30,9 @@ kubectl get pods
 r="0"
 while [ $r -ne "6" ]
 do
+   sleep 30
    kubectl get pods
    r=$(kubectl get pods | grep Running | wc -l)
-   sleep 60
 done
 
 # Validate the bookinfo app

diff --git a/src/vagrant/kubeadm_istio/istio/clean_bookinfo.sh b/src/vagrant/kubeadm_istio/istio/clean_bookinfo.sh
index b5bfc08..ede825f 100755 (executable)
--- a/src/vagrant/kubeadm_istio/istio/clean_bookinfo.sh
+++ b/src/vagrant/kubeadm_istio/istio/clean_bookinfo.sh
@@ -21,7 +21,7 @@ cd /vagrant/istio-source/
 export PATH=$PWD/bin:$PATH
 
 # Clean up bookinfo
-samples/bookinfo/kube/cleanup.sh
+echo "" | samples/bookinfo/kube/cleanup.sh
 
 istioctl get routerules
 kubectl get pods

diff --git a/src/vagrant/kubeadm_istio/istio/deploy.sh b/src/vagrant/kubeadm_istio/istio/deploy.sh
index 3dd1426..4abc856 100755 (executable)
--- a/src/vagrant/kubeadm_istio/istio/deploy.sh
+++ b/src/vagrant/kubeadm_istio/istio/deploy.sh
@@ -59,8 +59,8 @@ kubectl get namespace -L istio-injection
 r="1"
 while [ $r -ne "0" ]
 do
+   sleep 30
    kubectl get pods -n istio-system
    r=$(kubectl get pods -n istio-system | egrep -v 'NAME|Running' | wc -l)
-   sleep 60
 done