From 651223f7a5acb758ac0a65d05c4e419d8cbb8327 Mon Sep 17 00:00:00 2001
From: Philip Sahli <philip@sahli.net>
Date: Tue, 30 Oct 2018 17:49:12 +0100
Subject: [PATCH 1/7] first modifications

---
 .circleci/config.yml | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a183d2f..3613719 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -52,6 +52,11 @@ jobs:
             - /caches/app.tar
       - run: 
           command: curl https://raw.githubusercontent.com/kubernetes/helm/master/scripts/get | sh
+  test:
+    working_directory: /app
+    docker:
+      - image: docker:17.09.0-ce-git
+    steps:
       - run:
           name: helm lint for minikube
           command: |
@@ -81,11 +86,13 @@ workflows:
   version: 2
   test:
     jobs:
-      - build:
+      - build
+      - test:
           context: docker-hub
   release:
     jobs:
-      - build:
+      - build
+      - test:
           context: docker-hub
           filters:
             branches:

From d7a45cbbae63394a6e8c03534cc9c7ade83a5923 Mon Sep 17 00:00:00 2001
From: Philip Sahli <philip@sahli.net>
Date: Tue, 30 Oct 2018 17:52:39 +0100
Subject: [PATCH 2/7] add requires

---
 .circleci/config.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 3613719..88817b8 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -88,11 +88,15 @@ workflows:
     jobs:
       - build
       - test:
+          requires: 
+            - build
           context: docker-hub
   release:
     jobs:
       - build
       - test:
+          requires: 
+            - build
           context: docker-hub
           filters:
             branches:

From 1f62a21823201b7b397b1d80344d8def8e977d5e Mon Sep 17 00:00:00 2001
From: Philip Sahli <philip@sahli.net>
Date: Tue, 30 Oct 2018 21:18:26 +0100
Subject: [PATCH 3/7] add checkout

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 88817b8..a89806b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -57,6 +57,7 @@ jobs:
     docker:
       - image: docker:17.09.0-ce-git
     steps:
+      - checkout
       - run:
           name: helm lint for minikube
           command: |

From ed111729121ebc1f6d524de7d4c5f63b1a2fe22b Mon Sep 17 00:00:00 2001
From: Philip Sahli <philip@sahli.net>
Date: Tue, 30 Oct 2018 21:19:32 +0100
Subject: [PATCH 4/7] remove explicit build

---
 .circleci/config.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index a89806b..2edcf42 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -87,14 +87,12 @@ workflows:
   version: 2
   test:
     jobs:
-      - build
       - test:
           requires: 
             - build
           context: docker-hub
   release:
     jobs:
-      - build
       - test:
           requires: 
             - build

From edca6b4037b3bb03242380af021c60ec9da0dde5 Mon Sep 17 00:00:00 2001
From: Philip Sahli <philip@sahli.net>
Date: Tue, 30 Oct 2018 21:20:24 +0100
Subject: [PATCH 5/7] Revert "add checkout"

This reverts commit 1f62a21823201b7b397b1d80344d8def8e977d5e.
---
 .circleci/config.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 2edcf42..fbf1def 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -57,7 +57,6 @@ jobs:
     docker:
       - image: docker:17.09.0-ce-git
     steps:
-      - checkout
       - run:
           name: helm lint for minikube
           command: |

From 35b416fd3e55cbf06b682528a1254f382cfd0e0f Mon Sep 17 00:00:00 2001
From: Philip Sahli <philip@sahli.net>
Date: Tue, 30 Oct 2018 21:24:27 +0100
Subject: [PATCH 6/7] make one job

---
 .circleci/config.yml | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index fbf1def..f01249e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -61,6 +61,11 @@ jobs:
           name: helm lint for minikube
           command: |
             cd helm; helm lint plone-stack -f plone-stack/values-minikube.yaml
+  release:
+    working_directory: /app
+    docker:
+      - image: docker:17.09.0-ce-git
+    steps:
       - deploy:
           name: Push application Docker image
           command: |
@@ -84,17 +89,15 @@ jobs:
             docker images
 workflows:
   version: 2
-  test:
+  build-test-release:
     jobs:
+      - build
       - test:
           requires: 
             - build
-          context: docker-hub
-  release:
-    jobs:
-      - test:
+      - release:
           requires: 
-            - build
+            - test
           context: docker-hub
           filters:
             branches:

From 5dd3a7396e87f552032327ddd9968e934959d76a Mon Sep 17 00:00:00 2001
From: Philip Sahli <philip@sahli.net>
Date: Tue, 30 Oct 2018 21:38:39 +0100
Subject: [PATCH 7/7] add checkout

---
 .circleci/config.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index f01249e..9c10d2a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -57,6 +57,7 @@ jobs:
     docker:
       - image: docker:17.09.0-ce-git
     steps:
+      - checkout
       - run:
           name: helm lint for minikube
           command: |