@@ -178,30 +178,30 @@ integration-test:
178178 kubectl delete secret docker-store --ignore-not-found=true
179179 kubectl create secret docker-registry docker-store --docker-server=index.docker.io/v1/ --docker-username=$DOCKER_USERNAME --docker-password=$DOCKER_PASSWORD --docker-email=$DOCKER_EMAIL
180180
181- if [ `kubectl get ns -o name | grep namespaces/test1 | wc -l` = 1 ]; then
181+ if [ `kubectl get ns test1 | grep Error | wc -l` = 0 ]; then
182182 kubectl delete ns test1 --ignore-not-found=true
183- while [`kubectl get ns -o name | grep namespaces/test1 | wc -l` = 1 ]; do
183+ while [`kubectl get ns test1 -o jsonpath='{.status.phase}' | grep Terminating | wc -l` = 1 ]; do
184184 sleep 5
185185 done
186186 fi
187187 kubectl create ns test1
188- if [ `kubectl get ns -o name | grep namespaces/test2 | wc -l` = 1 ]; then
188+ if [ `kubectl get ns test2 | grep Error | wc -l` = 0 ]; then
189189 kubectl delete ns test2 --ignore-not-found=true
190- while [`kubectl get ns -o name | grep namespaces/test2 | wc -l` = 1 ]; do
190+ while [`kubectl get ns test2 -o jsonpath='{.status.phase}' | grep Terminating | wc -l` = 1 ]; do
191191 sleep 5
192192 done
193193 fi
194194 kubectl create ns test2
195- if [ `kubectl get ns -o name | grep namespaces/weblogic-operator-1 | wc -l` = 1 ]; then
195+ if [ `kubectl get ns weblogic-operator-1 | grep Error | wc -l` = 0 ]; then
196196 kubectl delete ns weblogic-operator-1 --ignore-not-found=true
197- while [`kubectl get ns -o name | grep namespaces/weblogic-operator-1 | wc -l` = 1 ]; do
197+ while [`kubectl get ns weblogic-operator-1 -o jsonpath='{.status.phase}' | grep Terminating | wc -l` = 1 ]; do
198198 sleep 5
199199 done
200200 fi
201201 kubectl create ns weblogic-operator-1
202- if [ `kubectl get ns -o name | grep namespaces/weblogic-operator-2 | wc -l` = 1 ]; then
202+ if [ `kubectl get ns weblogic-operator-2 | grep Error | wc -l` = 0 ]; then
203203 kubectl delete ns weblogic-operator-2 --ignore-not-found=true
204- while [`kubectl get ns -o name | grep namespaces/weblogic-operator-2 | wc -l` = 1 ]; do
204+ while [`kubectl get ns weblogic-operator-2 -o jsonpath='{.status.phase}' | grep Terminating | wc -l` = 1 ]; do
205205 sleep 5
206206 done
207207 fi
0 commit comments