@@ -52,8 +52,10 @@ build:
52
52
- script :
53
53
name : Remove things we do not want in the Docker image in order to reduce size of image
54
54
code : |
55
- yum -y remove tar gzip
55
+ rpm -e --nodeps tar
56
+ rpm -e --nodeps gzip
56
57
yum clean all
58
+ rm -rf /var/cache/yum
57
59
# push the image to quay.io using the GIT branch as the tag
58
60
# this image needs to be available to the integration-test pipeline for testing
59
61
- internal/docker-push :
@@ -67,11 +69,13 @@ build:
67
69
env : " PATH=$PATH:/operator"
68
70
69
71
# This pipeline runs the integration tests against a k8s cluster on OCI.
72
+ command-timeout : 60
70
73
integration-test :
71
74
steps :
72
75
- script :
73
76
name : Run integration tests
74
77
code : |
78
+ #!/bin/bash
75
79
function cleanup_and_store {
76
80
# release lease in case run.sh failed to release it
77
81
# (the following command only releases the release after confirming this pipeline still owns it)
@@ -87,8 +91,7 @@ integration-test:
87
91
88
92
function finish {
89
93
exit_code=$?
90
- varname=${WERCKER_DEPLOYTARGET_NAME}
91
- export ${!varname}-result="$exit_code"
94
+ export INTEGRATION_TEST_RESULT="$exit_code"
92
95
93
96
cleanup_and_store
94
97
exit 0
@@ -177,20 +180,45 @@ integration-test:
177
180
kubectl delete secret docker-store --ignore-not-found=true
178
181
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
179
182
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
181
189
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
182
213
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
183
214
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
186
216
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
187
217
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
190
219
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
191
220
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
194
222
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
195
223
196
224
export IMAGE_NAME_OPERATOR="quay.io/markxnelson/weblogic-kubernetes-operator"
0 commit comments