From b495710ff6e7988fafc10f0e47b0b25100e74181 Mon Sep 17 00:00:00 2001 From: Robert Scott Date: Thu, 1 Oct 2020 15:22:33 +0100 Subject: [PATCH] cd-smoke-test pipeline: merge build & deploy jobs concourse has an odd quirk that will result in the deploy job occasionally getting delayed by up to half an hour, which causes the canary check to fail. this only seems to happen if we're expecting to be triggered by the finish of a previous job, so just merge these jobs to stop this happening --- .../cd-smoke-test-pipeline.yaml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/charts/gsp-cluster/templates/04-main-team-pipelines/cd-smoke-test-pipeline.yaml b/charts/gsp-cluster/templates/04-main-team-pipelines/cd-smoke-test-pipeline.yaml index c46da540d..d24f63a92 100644 --- a/charts/gsp-cluster/templates/04-main-team-pipelines/cd-smoke-test-pipeline.yaml +++ b/charts/gsp-cluster/templates/04-main-team-pipelines/cd-smoke-test-pipeline.yaml @@ -55,7 +55,7 @@ spec: repository: ((canary.ImageRepositoryURI)) jobs: - - name: build + - name: build-deploy serial: true plan: - get: timer @@ -80,17 +80,6 @@ spec: params: image: image/image.tar additional_tags: src/.git/short_ref - - - name: deploy - serial: true - plan: - - get: src - passed: ["build"] - - get: ecr - passed: ["build"] - version: every - trigger: true - - task: generate-chart-values config: platform: linux