From 35020eceae239e4229b10376f61e3ba50fb9302a Mon Sep 17 00:00:00 2001
From: Ovidio Mallo <ovidio.mallo@netcetera.com>
Date: Tue, 6 Dec 2016 14:25:52 +0100
Subject: [PATCH] Wait for changes to be applied before deploying

---
 deployment/config/app.yaml | 1 +
 deployment/pipeline.groovy | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/deployment/config/app.yaml b/deployment/config/app.yaml
index 7f434a4..2031974 100644
--- a/deployment/config/app.yaml
+++ b/deployment/config/app.yaml
@@ -20,6 +20,7 @@ objects:
       spec:
         containers:
         - image: ${PROJECT_BASE}-${BUILD_ENV}/${APP}:${ENV}
+          imagePullPolicy: IfNotPresent
           name: ${APP}
           ports:
           - containerPort: 8080
diff --git a/deployment/pipeline.groovy b/deployment/pipeline.groovy
index 9cd65a1..edf56fb 100644
--- a/deployment/pipeline.groovy
+++ b/deployment/pipeline.groovy
@@ -12,6 +12,7 @@ node() {
   stage('Deploy to DEV') {
     sh "${ocCmd} process -f ${appConfigUrl} -v ENV=dev -n rubex-dev | ${ocCmd} apply -f - -n rubex-dev"
     sh "${ocCmd} tag rubex-dev/frontend:latest rubex-dev/frontend:dev"
+    sh "sleep 5"
     sh "${ocCmd} deploy frontend --latest --follow -n rubex-dev"
   }
 
@@ -24,6 +25,7 @@ node() {
     stage('Deploy to TEST') {
       sh "${ocCmd} process -f ${appConfigUrl} -v ENV=test -n rubex-test | ${ocCmd} apply -f - -n rubex-test"
       sh "${ocCmd} tag rubex-dev/frontend:dev rubex-dev/frontend:test"
+      sh "sleep 5"
       sh "${ocCmd} deploy frontend --latest --follow -n rubex-test"
     }
   }