diff options
author | QiLiang <liangqi1@huawei.com> | 2018-03-20 17:33:01 +0800 |
---|---|---|
committer | QiLiang <liangqi1@huawei.com> | 2018-03-20 17:35:44 +0800 |
commit | 37e8c639239ca83e11c5f378b501adb9e673fcc3 (patch) | |
tree | 2247763e2c5fea5da947b2884b0a9dc7d74ed7ae /src/vagrant/kubeadm_istio | |
parent | 63a58db0eed6119ebceaeb74a5bd552a00c742c6 (diff) |
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>
Diffstat (limited to 'src/vagrant/kubeadm_istio')
-rwxr-xr-x | src/vagrant/kubeadm_istio/istio/bookinfo.sh | 2 | ||||
-rwxr-xr-x | src/vagrant/kubeadm_istio/istio/clean_bookinfo.sh | 2 | ||||
-rwxr-xr-x | src/vagrant/kubeadm_istio/istio/deploy.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/vagrant/kubeadm_istio/istio/bookinfo.sh b/src/vagrant/kubeadm_istio/istio/bookinfo.sh index b61ea4e..cc09167 100755 --- 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 --- 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 --- 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 |