From 2b59174157f69631240b584d17eb12225e40a5c7 Mon Sep 17 00:00:00 2001 From: Kris Macoskey Date: Thu, 6 Sep 2018 16:21:30 +0000 Subject: [PATCH] ci: fix race condition in gptransfer ccp multi-cluster tests A race condition was occuring because the set of concourse tasks that create the second of two CCP clusters was expecting to find and use the `terraform` volume. The `terraform` volume is expected to only be created and used in the first set of tasks for the first CCP cluster. If the first set of tasks did not complete before the second set then there was the potential for the `terraform` volume to not exist yet. This causes the job to error in concourse. The fix is to correct the mistake of the second set of tasks using the wrong volume. They should only be using the `terraform2` volume. This completely removes the potential for the race condition. Authored-by: Kris Macoskey --- concourse/pipelines/5X_STABLE-generated.yml | 6 +++++- concourse/pipelines/templates/gpdb-tpl.yml | 4 ++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/concourse/pipelines/5X_STABLE-generated.yml b/concourse/pipelines/5X_STABLE-generated.yml index 47e19507c4..3ad78cf9dd 100644 --- a/concourse/pipelines/5X_STABLE-generated.yml +++ b/concourse/pipelines/5X_STABLE-generated.yml @@ -12,7 +12,7 @@ ## file (example: templates/gpdb-tpl.yml) and regenerate the pipeline ## using appropriate tool (example: gen_pipeline.py -t prod). ## ---------------------------------------------------------------------- -## Generated by gen_pipeline.py at: 2018-09-01 16:55:38.884770 +## Generated by gen_pipeline.py at: 2018-09-06 16:20:51.106027 ## Template file: gpdb-tpl.yml ## OS Types: ['centos6', 'centos7', 'sles', 'aix7', 'win', 'ubuntu16'] ## Test Sections: ['ICW', 'CS', 'MPP', 'MM', 'DPM', 'UD', 'FileRep', 'AA'] @@ -3437,6 +3437,8 @@ jobs: output_mapping: cluster_env_files: cluster_env_files2 - task: gpinitsystem + input_mapping: + terraform: terraform2 config: platform: linux image_resource: @@ -3538,6 +3540,8 @@ jobs: output_mapping: cluster_env_files: cluster_env_files2 - task: gpinitsystem + input_mapping: + terraform: terraform2 config: platform: linux image_resource: diff --git a/concourse/pipelines/templates/gpdb-tpl.yml b/concourse/pipelines/templates/gpdb-tpl.yml index e8f35358a1..7976fde601 100644 --- a/concourse/pipelines/templates/gpdb-tpl.yml +++ b/concourse/pipelines/templates/gpdb-tpl.yml @@ -3076,6 +3076,8 @@ jobs: output_mapping: cluster_env_files: cluster_env_files2 - task: gpinitsystem + input_mapping: + terraform: terraform2 config: platform: linux image_resource: @@ -3177,6 +3179,8 @@ jobs: output_mapping: cluster_env_files: cluster_env_files2 - task: gpinitsystem + input_mapping: + terraform: terraform2 config: platform: linux image_resource: -- GitLab