From efc71d9f2d7a9e9e089df5ac356ad43baf88e8b0 Mon Sep 17 00:00:00 2001
From: Ovidio Mallo <ovidio.mallo@gmail.com>
Date: Wed, 4 Jan 2017 01:19:16 +0100
Subject: [PATCH] Build to a new tag named "b-master"

---
 deployment/config.yaml                   | 2 ++
 deployment/delivery-pipeline.groovy      | 2 +-
 deployment/feature-build-pipeline.groovy | 1 -
 deployment/manifests/build.yaml          | 5 ++++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/deployment/config.yaml b/deployment/config.yaml
index 328bc29..44b64d4 100644
--- a/deployment/config.yaml
+++ b/deployment/config.yaml
@@ -3,6 +3,8 @@ dev:
     frontend:
       templates:
       - manifest: deployment/manifests/build.yaml
+        parameters:
+          TARGET_IMAGE_STREAM_TAG: b-master
   deployment:
     frontend:
       templates:
diff --git a/deployment/delivery-pipeline.groovy b/deployment/delivery-pipeline.groovy
index b451f5b..863c0ad 100644
--- a/deployment/delivery-pipeline.groovy
+++ b/deployment/delivery-pipeline.groovy
@@ -18,7 +18,7 @@ node() {
   }
 
   stage("Deploy to DEV") {
-    occd.tag("rubex-dev", "frontend", "latest", "dev")
+    occd.tag("rubex-dev", "frontend", "b-master", "dev")
     occd.rollout("rubex-dev", "frontend", config.dev.deployment.frontend)
   }
 
diff --git a/deployment/feature-build-pipeline.groovy b/deployment/feature-build-pipeline.groovy
index 7f3fbaa..3ad4264 100644
--- a/deployment/feature-build-pipeline.groovy
+++ b/deployment/feature-build-pipeline.groovy
@@ -4,6 +4,5 @@ node() {
   stage("Checkout") {
     deleteDir()
     git(url: "https://github.com/omallo/ruby-ex.git", branch: "${FEATURE_BRANCH}", credentialsId: "github-omallo")
-    sh "git status"
   }
 }
diff --git a/deployment/manifests/build.yaml b/deployment/manifests/build.yaml
index 1c11da9..a665d79 100644
--- a/deployment/manifests/build.yaml
+++ b/deployment/manifests/build.yaml
@@ -17,7 +17,7 @@ objects:
     output:
       to:
         kind: ImageStreamTag
-        name: frontend:latest
+        name: frontend:${TARGET_IMAGE_STREAM_TAG}
     source:
       type: Binary
       binary: {}
@@ -28,3 +28,6 @@ objects:
           kind: ImageStreamTag
           name: ruby:2.3
           namespace: openshift
+- description: The image stream tag to build to.
+  displayName: Target image stream tag
+  name: TARGET_IMAGE_STREAM_TAG