From 8b67562c678edc6d0e4608d60242ce4c57553a04 Mon Sep 17 00:00:00 2001 From: Ovidio Mallo Date: Wed, 4 Jan 2017 11:45:28 +0100 Subject: [PATCH] Pass the branch to the build config --- deployment/config.yaml | 6 ------ deployment/delivery-pipeline.groovy | 2 +- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/deployment/config.yaml b/deployment/config.yaml index e549c5b..3b165c9 100644 --- a/deployment/config.yaml +++ b/deployment/config.yaml @@ -1,10 +1,4 @@ dev: - build: - frontend: - templates: - - manifest: deployment/manifests/build.yaml - parameters: - BRANCH: master deployment: frontend: templates: diff --git a/deployment/delivery-pipeline.groovy b/deployment/delivery-pipeline.groovy index fb1a616..ba534a7 100644 --- a/deployment/delivery-pipeline.groovy +++ b/deployment/delivery-pipeline.groovy @@ -14,7 +14,7 @@ node() { stage("Build") { echo "versions: build=${buildVersion}, next-release=${releaseVersion}" sh "sed -e 's/{{BUILD_VERSION}}/${buildVersion}/g' -i config.ru" - occd.build("rubex-dev", "frontend-master", config.dev.build.frontend) + occd.build("rubex-dev", "frontend-master", "deployment/manifests/build.yaml", "master") } stage("Deploy to DEV") {