From 6b9c1fe317c350be819bb7baa9f79f86a30eef82 Mon Sep 17 00:00:00 2001
From: Dmitrii Dolgov <dmitrii.dolgov@zalando.de>
Date: Wed, 14 Feb 2018 13:08:53 +0100
Subject: [PATCH 1/9] Add a new step to run unit tests

---
 delivery.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/delivery.yaml b/delivery.yaml
index 9878a2ad5..647341ab4 100644
--- a/delivery.yaml
+++ b/delivery.yaml
@@ -19,6 +19,11 @@ build_steps:
         export OPERATOR_TOP_DIR=$GOPATH/src/github.com/zalando-incubator
         mkdir -p $OPERATOR_TOP_DIR
         ln -s $(pwd) $OPERATOR_TOP_DIR/postgres-operator
+    - desc: 'Run unit tests'
+      cmd: |
+        export PATH=$PATH:$HOME/go/bin
+        export GOPATH=$HOME/go
+        go test ./...
     - desc: 'Build & push docker image'
       cmd: |
         export PATH=$PATH:$HOME/go/bin

From c54fb7b4c8e92e76fe805ba90d05a9ed203d38eb Mon Sep 17 00:00:00 2001
From: Dmitrii Dolgov <dmitrii.dolgov@zalando.de>
Date: Wed, 14 Feb 2018 13:24:43 +0100
Subject: [PATCH 2/9] Build before actually test

---
 delivery.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/delivery.yaml b/delivery.yaml
index 647341ab4..942b27c14 100644
--- a/delivery.yaml
+++ b/delivery.yaml
@@ -23,6 +23,7 @@ build_steps:
       cmd: |
         export PATH=$PATH:$HOME/go/bin
         export GOPATH=$HOME/go
+        make tools deps
         go test ./...
     - desc: 'Build & push docker image'
       cmd: |

From 4513334d1b6a5612cc7ff87b09efd61fb3c81b3a Mon Sep 17 00:00:00 2001
From: Dmitrii Dolgov <dmitrii.dolgov@zalando.de>
Date: Wed, 14 Feb 2018 13:28:16 +0100
Subject: [PATCH 3/9] Change order of the steps

---
 delivery.yaml | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/delivery.yaml b/delivery.yaml
index 942b27c14..8fdd75570 100644
--- a/delivery.yaml
+++ b/delivery.yaml
@@ -19,12 +19,6 @@ build_steps:
         export OPERATOR_TOP_DIR=$GOPATH/src/github.com/zalando-incubator
         mkdir -p $OPERATOR_TOP_DIR
         ln -s $(pwd) $OPERATOR_TOP_DIR/postgres-operator
-    - desc: 'Run unit tests'
-      cmd: |
-        export PATH=$PATH:$HOME/go/bin
-        export GOPATH=$HOME/go
-        make tools deps
-        go test ./...
     - desc: 'Build & push docker image'
       cmd: |
         export PATH=$PATH:$HOME/go/bin
@@ -37,3 +31,8 @@ build_steps:
         fi
         export IMAGE
         make tools deps docker push
+    - desc: 'Run unit tests'
+      cmd: |
+        export PATH=$PATH:$HOME/go/bin
+        export GOPATH=$HOME/go
+        go test ./...

From eb2283aa437139fa7dcf1c3860f86289cb47caf6 Mon Sep 17 00:00:00 2001
From: Dmitrii Dolgov <dmitrii.dolgov@zalando.de>
Date: Wed, 14 Feb 2018 13:51:55 +0100
Subject: [PATCH 4/9] Change current directory for tests

---
 delivery.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/delivery.yaml b/delivery.yaml
index 8fdd75570..f77c28e74 100644
--- a/delivery.yaml
+++ b/delivery.yaml
@@ -35,4 +35,5 @@ build_steps:
       cmd: |
         export PATH=$PATH:$HOME/go/bin
         export GOPATH=$HOME/go
+        cd $OPERATOR_TOP_DIR/postgres-operator
         go test ./...

From c21136c151ca6d9127dca7cf5311fec7945041a8 Mon Sep 17 00:00:00 2001
From: Dmitrii Dolgov <dmitrii.dolgov@zalando.de>
Date: Wed, 14 Feb 2018 13:56:35 +0100
Subject: [PATCH 5/9] Forgotten env var

---
 delivery.yaml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/delivery.yaml b/delivery.yaml
index f77c28e74..f5272b7c1 100644
--- a/delivery.yaml
+++ b/delivery.yaml
@@ -35,5 +35,6 @@ build_steps:
       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 ./...

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 6/9] 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

From 7b9428bb8158c746d9e582a3086435f1648fa495 Mon Sep 17 00:00:00 2001
From: Dmitrii Dolgov <dmitrii.dolgov@zalando.de>
Date: Wed, 14 Feb 2018 14:10:48 +0100
Subject: [PATCH 7/9] Switch to the new format

---
 delivery.yaml | 107 ++++++++++++++++++++++++++------------------------
 1 file changed, 55 insertions(+), 52 deletions(-)

diff --git a/delivery.yaml b/delivery.yaml
index 7219a652b..0a301bb11 100644
--- a/delivery.yaml
+++ b/delivery.yaml
@@ -1,52 +1,55 @@
-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
-    - desc: 'Install go'
-      cmd: |
-        cd /tmp
-        wget -q https://storage.googleapis.com/golang/go1.9.linux-amd64.tar.gz -O go.tar.gz
-        tar -xf go.tar.gz
-        mv go /usr/local
-        ln -s /usr/local/go/bin/go /usr/bin/go
-        go version
-    - desc: 'Install Docker'
-      cmd: |
-        curl -sSL https://get.docker.com/ | sh
-    - desc: 'Symlink sources into the GOPATH'
-      cmd: |
-        mkdir -p $OPERATOR_TOP_DIR
-        ln -s $(pwd) $OPERATOR_TOP_DIR/postgres-operator
-    - desc: 'Build 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 tools deps docker
-    - desc: 'Run unit tests'
-      cmd: |
-        export PATH=$PATH:$HOME/go/bin
-        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
+version: "2017-09-20"
+pipeline:
+    - id: "Build postgres operator"
+      type: script
+      env:
+        GOPATH: /root/go
+        OPERATOR_TOP_DIR: /root/go/src/github.com/zalando-incubator
+      commands:
+        - desc: 'Install required build software'
+          cmd: |
+            apt-get install -y make git apt-transport-https ca-certificates curl
+        - desc: 'Install go'
+          cmd: |
+            cd /tmp
+            wget -q https://storage.googleapis.com/golang/go1.9.linux-amd64.tar.gz -O go.tar.gz
+            tar -xf go.tar.gz
+            mv go /usr/local
+            ln -s /usr/local/go/bin/go /usr/bin/go
+            go version
+        - desc: 'Install Docker'
+          cmd: |
+            curl -sSL https://get.docker.com/ | sh
+        - desc: 'Symlink sources into the GOPATH'
+          cmd: |
+            mkdir -p $OPERATOR_TOP_DIR
+            ln -s $(pwd) $OPERATOR_TOP_DIR/postgres-operator
+        - desc: 'Build 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 tools deps docker
+        - desc: 'Run unit tests'
+          cmd: |
+            export PATH=$PATH:$HOME/go/bin
+            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

From b6ae3e0262f556eb193616f8a7c329fb080b72da Mon Sep 17 00:00:00 2001
From: Dmitrii Dolgov <dmitrii.dolgov@zalando.de>
Date: Wed, 14 Feb 2018 14:11:56 +0100
Subject: [PATCH 8/9] Change build id

---
 delivery.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/delivery.yaml b/delivery.yaml
index 0a301bb11..b4cb5b844 100644
--- a/delivery.yaml
+++ b/delivery.yaml
@@ -1,6 +1,6 @@
 version: "2017-09-20"
 pipeline:
-    - id: "Build postgres operator"
+    - id: Build postgres operator
       type: script
       env:
         GOPATH: /root/go

From f6b213535119c384d24f9c401e21a7953d4e8655 Mon Sep 17 00:00:00 2001
From: Dmitrii Dolgov <dmitrii.dolgov@zalando.de>
Date: Wed, 14 Feb 2018 14:12:39 +0100
Subject: [PATCH 9/9] Change build id

---
 delivery.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/delivery.yaml b/delivery.yaml
index b4cb5b844..d2b176234 100644
--- a/delivery.yaml
+++ b/delivery.yaml
@@ -1,6 +1,6 @@
 version: "2017-09-20"
 pipeline:
-    - id: Build postgres operator
+    - id: build-postgres-operator
       type: script
       env:
         GOPATH: /root/go