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