Skip to content

Commit 66245bc

Browse files
committed
Resolve wercker failures
1 parent 2aa9dfc commit 66245bc

File tree

1 file changed

+38
-10
lines changed

1 file changed

+38
-10
lines changed

wercker.yml

Lines changed: 38 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,10 @@ build:
5252
- script:
5353
name: Remove things we do not want in the Docker image in order to reduce size of image
5454
code: |
55-
yum -y remove tar gzip
55+
rpm -e --nodeps tar
56+
rpm -e --nodeps gzip
5657
yum clean all
58+
rm -rf /var/cache/yum
5759
# push the image to quay.io using the GIT branch as the tag
5860
# this image needs to be available to the integration-test pipeline for testing
5961
- internal/docker-push:
@@ -67,11 +69,13 @@ build:
6769
env: "PATH=$PATH:/operator"
6870

6971
# This pipeline runs the integration tests against a k8s cluster on OCI.
72+
command-timeout: 60
7073
integration-test:
7174
steps:
7275
- script:
7376
name: Run integration tests
7477
code: |
78+
#!/bin/bash
7579
function cleanup_and_store {
7680
# release lease in case run.sh failed to release it
7781
# (the following command only releases the release after confirming this pipeline still owns it)
@@ -87,8 +91,7 @@ integration-test:
8791
8892
function finish {
8993
exit_code=$?
90-
varname=${WERCKER_DEPLOYTARGET_NAME}
91-
export ${!varname}-result="$exit_code"
94+
export INTEGRATION_TEST_RESULT="$exit_code"
9295
9396
cleanup_and_store
9497
exit 0
@@ -177,20 +180,45 @@ integration-test:
177180
kubectl delete secret docker-store --ignore-not-found=true
178181
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
179182
180-
kubectl delete ns test1 --ignore-not-found=true
183+
if [ `kubectl get ns test1 | grep Error | wc -l` = 0 ]; then
184+
kubectl delete ns test1 --ignore-not-found=true
185+
while [`kubectl get ns test1 -o jsonpath='{.status.phase}' | grep Terminating | wc -l` = 1 ]; do
186+
sleep 5
187+
done
188+
fi
181189
kubectl create ns test1
190+
if [ `kubectl get ns test2 | grep Error | wc -l` = 0 ]; then
191+
kubectl delete ns test2 --ignore-not-found=true
192+
while [`kubectl get ns test2 -o jsonpath='{.status.phase}' | grep Terminating | wc -l` = 1 ]; do
193+
sleep 5
194+
done
195+
fi
196+
kubectl create ns test2
197+
if [ `kubectl get ns weblogic-operator-1 | grep Error | wc -l` = 0 ]; then
198+
kubectl delete ns weblogic-operator-1 --ignore-not-found=true
199+
while [`kubectl get ns weblogic-operator-1 -o jsonpath='{.status.phase}' | grep Terminating | wc -l` = 1 ]; do
200+
sleep 5
201+
done
202+
fi
203+
kubectl create ns weblogic-operator-1
204+
if [ `kubectl get ns weblogic-operator-2 | grep Error | wc -l` = 0 ]; then
205+
kubectl delete ns weblogic-operator-2 --ignore-not-found=true
206+
while [`kubectl get ns weblogic-operator-2 -o jsonpath='{.status.phase}' | grep Terminating | wc -l` = 1 ]; do
207+
sleep 5
208+
done
209+
fi
210+
kubectl create ns weblogic-operator-2
211+
212+
kubectl delete secret docker-store -n test1 --ignore-not-found=true
182213
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
183214
184-
kubectl delete ns test2 --ignore-not-found=true
185-
kubectl create ns test2
215+
kubectl delete secret docker-store -n test2 --ignore-not-found=true
186216
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
187217
188-
kubectl delete ns weblogic-operator-1 --ignore-not-found=true
189-
kubectl create ns weblogic-operator-1
218+
kubectl delete secret quay-io -n weblogic-operator-1 --ignore-not-found=true
190219
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
191220
192-
kubectl delete ns weblogic-operator-2 --ignore-not-found=true
193-
kubectl create ns weblogic-operator-2
221+
kubectl delete secret quay-io -n weblogic-operator-2 --ignore-not-found=true
194222
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
195223
196224
export IMAGE_NAME_OPERATOR="quay.io/markxnelson/weblogic-kubernetes-operator"

0 commit comments

Comments
 (0)