Skip to content

Commit ad75293

Browse files
committed
Can't push master tag
1 parent 623a314 commit ad75293

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

wercker.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@ build:
4343
mkdir /operator
4444
cp -R src/main/scripts/* /operator/
4545
cp target/weblogic-kubernetes-operator-0.1.0-alpha-SNAPSHOT.jar /operator/weblogic-kubernetes-operator.jar
46+
export IMAGE_TAG_OPERATOR="${WERCKER_GIT_BRANCH//[_/]/-}"
47+
if [ "$IMAGE_TAG_OPERATOR" = "master" ]; then
48+
export IMAGE_TAG_OPERATOR = "latest"
49+
fi
4650
- script:
4751
name: Remove things we do not want in the Docker image in order to reduce size of image
4852
code: |
@@ -55,7 +59,7 @@ build:
5559
password: $QUAY_PASSWORD
5660
email: $QUAY_EMAIL
5761
repository: quay.io/markxnelson/weblogic-kubernetes-operator
58-
tag: ${WERCKER_GIT_BRANCH//[_/]/-}
62+
tag: $IMAGE_TAG_OPERATOR
5963
working-dir: "/operator"
6064
cmd: "operator.sh"
6165
env: "PATH=$PATH:/operator"
@@ -143,12 +147,15 @@ integration-test:
143147
144148
export IMAGE_NAME_OPERATOR="quay.io/markxnelson/weblogic-kubernetes-operator"
145149
export IMAGE_TAG_OPERATOR="${WERCKER_GIT_BRANCH//[_/]/-}"
150+
if [ "$IMAGE_TAG_OPERATOR" = "master" ]; then
151+
export IMAGE_TAG_OPERATOR = "latest"
152+
fi
146153
export IMAGE_PULL_POLICY_OPERATOR="IfNotPresent"
147154
export IMAGE_PULL_SECRET_OPERATOR="quay-io"
148155
export IMAGE_PULL_SECRET_WEBLOGIC="docker-store"
149156
150157
echo "Integration test suite against the test image which is:"
151-
echo "$IMAGE_NAME:$IMAGE_TAG"
158+
echo "$IMAGE_NAME_OPERATOR:$IMAGE_TAG_OPERATOR"
152159
153160
# integration tests
154161
$WERCKER_SOURCE_DIR/src/integration-tests/bash/run.sh

0 commit comments

Comments
 (0)