From 63b10ace527c584bc326fbd2c0f4547c516bc1e2 Mon Sep 17 00:00:00 2001
From: Ovidio Mallo <ovidio.mallo@netcetera.com>
Date: Tue, 6 Dec 2016 21:53:41 +0100
Subject: [PATCH] Enable automatic deployment

---
 config.ru                  | 2 +-
 deployment/config/app.yaml | 2 +-
 deployment/pipeline.groovy | 6 ++----
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/config.ru b/config.ru
index f833501..660a87f 100755
--- a/config.ru
+++ b/config.ru
@@ -226,7 +226,7 @@ pre {
 
 <section class='container'>
           <hgroup>
-            <h1>Welcome to your Ruby application on OpenShift (version 7)</h1>
+            <h1>Welcome to your Ruby application on OpenShift (version 8)</h1>
           </hgroup>
 
 
diff --git a/deployment/config/app.yaml b/deployment/config/app.yaml
index d70f3de..6c464f0 100644
--- a/deployment/config/app.yaml
+++ b/deployment/config/app.yaml
@@ -28,7 +28,7 @@ objects:
     triggers:
     - type: ImageChange
       imageChangeParams:
-        automatic: false
+        automatic: true
         containerNames:
         - ${APP}
         from:
diff --git a/deployment/pipeline.groovy b/deployment/pipeline.groovy
index edf56fb..182d76a 100644
--- a/deployment/pipeline.groovy
+++ b/deployment/pipeline.groovy
@@ -12,8 +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"
+    sh "${ocCmd} deploy frontend --follow -n rubex-dev"
   }
 
   def isPromoteToTest = false
@@ -25,8 +24,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"
+      sh "${ocCmd} deploy frontend --follow -n rubex-test"
     }
   }
 }