From e5ba8cf02be0e931b8990e07391be368f0ede901 Mon Sep 17 00:00:00 2001
From: bandesz <bandesz@gmail.com>
Date: Mon, 20 Feb 2017 13:03:19 +0000
Subject: [PATCH] Fix PaaS deploy in Jenkinsfile

---
 Jenkinsfile | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index c269deea6..9826d1f04 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -37,44 +37,44 @@ def deploy(cfEnv) {
         ]) {
           withEnv(["CF_SPACE=${cfEnv}"]) {
             parallel deployApi: {
-              withEnv(["CF_APP=notify-api"]) {
-                retry(3) {
-                  sh 'make cf-deploy'
+              retry(3) {
+                withEnv(["CF_APP=notify-api"]) {
+                  sh 'make cf-deploy-with-docker'
                 }
               }
             }, deployDeliveryCeleryBeat: {
               sleep(10)
-              withEnv(["CF_APP=notify-delivery-celery-beat"]) {
-                retry(3) {
-                  sh 'make cf-deploy'
+              retry(3) {
+                withEnv(["CF_APP=notify-delivery-celery-beat"]) {
+                  sh 'make cf-deploy-with-docker'
                 }
               }
             }, deployDeliveryWorker: {
               sleep(20)
-              withEnv(["CF_APP=notify-delivery-worker"]) {
-                retry(3) {
-                  sh 'make cf-deploy'
+              retry(3) {
+                withEnv(["CF_APP=notify-delivery-worker"]) {
+                  sh 'make cf-deploy-with-docker'
                 }
               }
             }, deployDeliveryWorkerSender: {
               sleep(30)
-              withEnv(["CF_APP=notify-delivery-worker-sender"]) {
-                retry(3) {
-                  sh 'make cf-deploy'
+              retry(3) {
+                withEnv(["CF_APP=notify-delivery-worker-sender"]) {
+                  sh 'make cf-deploy-with-docker'
                 }
               }
             }, deployDeliveryWorkerDatabase: {
               sleep(40)
-              withEnv(["CF_APP=notify-delivery-worker-database"]) {
-                retry(3) {
-                  sh 'make cf-deploy'
+              retry(3) {
+                withEnv(["CF_APP=notify-delivery-worker-database"]) {
+                  sh 'make cf-deploy-with-docker'
                 }
               }
             }, deployDeliveryWorkerResearch: {
               sleep(50)
-              withEnv(["CF_APP=notify-delivery-worker-research"]) {
-                retry(3) {
-                  sh 'make cf-deploy'
+              retry(3) {
+                withEnv(["CF_APP=notify-delivery-worker-research"]) {
+                  sh 'make cf-deploy-with-docker'
                 }
               }
             }