From d61b87a07d00c70b5a17b53839563a6c0c2af29f Mon Sep 17 00:00:00 2001
From: Dmitrii Dolgov <dmitrii.dolgov@zalando.de>
Date: Wed, 14 Feb 2018 14:07:53 +0100
Subject: [PATCH] Separate image build & push Move out some variables on top

---
 delivery.yaml | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

diff --git a/delivery.yaml b/delivery.yaml
index f5272b7c1..7219a652b 100644
--- a/delivery.yaml
+++ b/delivery.yaml
@@ -1,4 +1,8 @@
 build_steps:
+    env:
+      GOPATH: /root/go
+      OPERATOR_TOP_DIR: /root/go/src/github.com/zalando-incubator
+
     - desc: 'Install required build software'
       cmd: |
         apt-get install -y make git apt-transport-https ca-certificates curl
@@ -15,11 +19,9 @@ build_steps:
         curl -sSL https://get.docker.com/ | sh
     - desc: 'Symlink sources into the GOPATH'
       cmd: |
-        export GOPATH=$HOME/go
-        export OPERATOR_TOP_DIR=$GOPATH/src/github.com/zalando-incubator
         mkdir -p $OPERATOR_TOP_DIR
         ln -s $(pwd) $OPERATOR_TOP_DIR/postgres-operator
-    - desc: 'Build & push docker image'
+    - desc: 'Build docker image'
       cmd: |
         export PATH=$PATH:$HOME/go/bin
         IS_PR_BUILD=${CDP_PULL_REQUEST_NUMBER+"true"}
@@ -30,11 +32,21 @@ build_steps:
           IMAGE=registry-write.opensource.zalan.do/acid/postgres-operator-test
         fi
         export IMAGE
-        make tools deps docker push
+        make tools deps docker
     - desc: 'Run unit tests'
       cmd: |
         export PATH=$PATH:$HOME/go/bin
-        export GOPATH=$HOME/go
-        export OPERATOR_TOP_DIR=$GOPATH/src/github.com/zalando-incubator
         cd $OPERATOR_TOP_DIR/postgres-operator
         go test ./...
+    - desc: 'Push docker image'
+      cmd: |
+        export PATH=$PATH:$HOME/go/bin
+        IS_PR_BUILD=${CDP_PULL_REQUEST_NUMBER+"true"}
+        if [[ ${CDP_TARGET_BRANCH} == "master" && ${IS_PR_BUILD} != "true" ]]
+        then
+          IMAGE=registry-write.opensource.zalan.do/acid/postgres-operator
+        else
+          IMAGE=registry-write.opensource.zalan.do/acid/postgres-operator-test
+        fi
+        export IMAGE
+        make push