From fc79631a1c2716d42d2748c0a29ad5e3a35b854d Mon Sep 17 00:00:00 2001
From: Ovidio Mallo <ovidio.mallo@gmail.com>
Date: Wed, 4 Jan 2017 12:06:28 +0100
Subject: [PATCH] Add a feature build

---
 deployment/delivery-pipeline.groovy      | 11 +++++++----
 deployment/feature-build-pipeline.groovy |  9 +++++++++
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/deployment/delivery-pipeline.groovy b/deployment/delivery-pipeline.groovy
index ba534a7..6106cb1 100644
--- a/deployment/delivery-pipeline.groovy
+++ b/deployment/delivery-pipeline.groovy
@@ -8,12 +8,12 @@ node() {
 
   def config = occd.parseConfig(readFile("deployment/config.yaml"))
 
-  def buildVersion = occd.getBuildVersion()
-  def releaseVersion = occd.getReleaseVersion()
-
   stage("Build") {
-    echo "versions: build=${buildVersion}, next-release=${releaseVersion}"
+    def buildVersion = occd.getDeliveryBuildVersion()
+    echo "buildVersion=${buildVersion}"
+
     sh "sed -e 's/{{BUILD_VERSION}}/${buildVersion}/g' -i config.ru"
+
     occd.build("rubex-dev", "frontend-master", "deployment/manifests/build.yaml", "master")
   }
 
@@ -29,6 +29,9 @@ node() {
 
   if (isPromoteToTest) {
     stage("Deploy to TEST") {
+      def releaseVersion = occd.getReleaseVersion()
+      echo "releaseVersion=${releaseVersion}"
+
       withCredentials([[$class: 'UsernamePasswordMultiBinding', credentialsId: 'github-omallo', usernameVariable: 'GIT_USERNAME', passwordVariable: 'GIT_PASSWORD']]) {
         sh "git tag ${releaseVersion}"
         sh "git push --tags https://${GIT_USERNAME}:${GIT_PASSWORD}@github.com/omallo/ruby-ex.git"
diff --git a/deployment/feature-build-pipeline.groovy b/deployment/feature-build-pipeline.groovy
index 3ad4264..dd10ada 100644
--- a/deployment/feature-build-pipeline.groovy
+++ b/deployment/feature-build-pipeline.groovy
@@ -5,4 +5,13 @@ node() {
     deleteDir()
     git(url: "https://github.com/omallo/ruby-ex.git", branch: "${FEATURE_BRANCH}", credentialsId: "github-omallo")
   }
+
+  stage("Build") {
+    def buildVersion = occd.getFeatureBuildVersion("${FEATURE_BRANCH}")
+    echo "versions: build=${buildVersion}"
+
+    sh "sed -e 's/{{BUILD_VERSION}}/${buildVersion}/g' -i config.ru"
+
+    occd.build("rubex-dev", "frontend-${FEATURE_BRANCH}", "deployment/manifests/build.yaml", "${FEATURE_BRANCH}")
+  }
 }