Skip to content

Commit d75bf41

Browse files
committed
Simplify pre-integation test cleanup
1 parent bd00ee8 commit d75bf41

File tree

1 file changed

+18
-8
lines changed

1 file changed

+18
-8
lines changed

wercker.yml

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -178,20 +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-
kubectl delete ns test1 --ignore-not-found=true
182-
kubectl create ns test1
181+
local nss = `kubectl get ns -o name`
182+
if [ `kubectl get ns -o name | grep namespaces/test1 | wc -l` = 0 ]; then
183+
kubectl create ns test1
184+
fi
185+
if [ `kubectl get ns -o name | grep namespaces/test2 | wc -l` = 0 ]; then
186+
kubectl create ns test2
187+
fi
188+
if [ `kubectl get ns -o name | grep namespaces/weblogic-operator-1 | wc -l` = 0 ]; then
189+
kubectl create ns weblogic-operator-1
190+
fi
191+
if [ `kubectl get ns -o name | grep namespaces/weblogic-operator-2 | wc -l` = 0 ]; then
192+
kubectl create ns weblogic-operator-2
193+
fi
194+
195+
kubectl delete secret docker-store -n test1 --ignore-not-found=true
183196
kubectl create secret docker-registry docker-store -n test1 --docker-server=index.docker.io/v1/ --docker-username=$DOCKER_USERNAME --docker-password=$DOCKER_PASSWORD --docker-email=$DOCKER_EMAIL
184197
185-
kubectl delete ns test2 --ignore-not-found=true
186-
kubectl create ns test2
198+
kubectl delete secret docker-store -n test2 --ignore-not-found=true
187199
kubectl create secret docker-registry docker-store -n test2 --docker-server=index.docker.io/v1/ --docker-username=$DOCKER_USERNAME --docker-password=$DOCKER_PASSWORD --docker-email=$DOCKER_EMAIL
188200
189-
kubectl delete ns weblogic-operator-1 --ignore-not-found=true
190-
kubectl create ns weblogic-operator-1
201+
kubectl delete secret quay-io -n weblogic-operator-1 --ignore-not-found=true
191202
kubectl create secret docker-registry quay-io -n weblogic-operator-1 --docker-server=quay.io --docker-username=$QUAY_USERNAME --docker-password=$QUAY_PASSWORD --docker-email=$QUAY_EMAIL
192203
193-
kubectl delete ns weblogic-operator-2 --ignore-not-found=true
194-
kubectl create ns weblogic-operator-2
204+
kubectl delete secret quay-io -n weblogic-operator-2 --ignore-not-found=true
195205
kubectl create secret docker-registry quay-io -n weblogic-operator-2 --docker-server=quay.io --docker-username=$QUAY_USERNAME --docker-password=$QUAY_PASSWORD --docker-email=$QUAY_EMAIL
196206
197207
export IMAGE_NAME_OPERATOR="quay.io/markxnelson/weblogic-kubernetes-operator"

0 commit comments

Comments
 (0)