concourse: clarify terminology for multiple-cluster jobs

calling something "terraform2" or similar refers to the second cluster
anchor tags for stanzas which operate on both clusters are "two clusters"

- [ ] ~~set-pipeline when merge~~ no applicable change to pipeline

[ci skip]
Follow-on to #4546
Authored-by: NC.J. Jameson <cjameson@pivotal.io>
(cherry picked from commit fdf13b64)

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-02-15 09:23:59.755597
+## Generated by gen_pipeline.py at: 2018-02-16 16:17:58.087722
 ## Template file: gpdb-tpl.yml
 ## OS Types: ['centos6', 'centos7', 'sles', 'aix7', 'win', 'ubuntu16']
 ## Test Sections: ['ICW', 'CS', 'MPP', 'MM', 'DPM', 'UD', 'FileRep', 'AA']
@@ -321,6 +321,7 @@ resources:
       bucket: gpdb5-pipeline-dynamic-terraform
       bucket_path: clusters/
 
+# a second cluster for gptransfer tests
 - name: terraform2
   type: terraform
   source:
@@ -738,7 +739,7 @@ ccp_destroy_anchor: &ccp_destroy
   get_params:
     action: destroy
 
-ccp_destroy_2_cluster_anchor: &ccp_destroy_2_cluster
+ccp_destroy_two_clusters_anchor: &ccp_destroy_two_clusters
   do:
   - *ccp_destroy
   - put: terraform2
@@ -801,7 +802,7 @@ set_failed_anchor: &set_failed
         BUCKET_PATH: clusters/
         BUCKET_NAME: {{tf-bucket-name}}
 
-set_failed_anchor_2: &set_failed_2_cluster
+set_failed_anchor_two_clusters: &set_failed_two_clusters
   do:
   - *set_failed
   - task: on_failure_set_failed
@@ -3283,9 +3284,9 @@ jobs:
       BEHAVE_FLAGS: --tags=gptransfer --tags=-skip_source_43
       CUSTOM_ENV: export GPTRANSFER_DEST_HOST=mdw; export GPTRANSFER_DEST_PORT=5432; export GPTRANSFER_DEST_USER=gpadmin; export GPTRANSFER_MAP_FILE=/tmp/source_map_file; export GPTRANSFER_SOURCE_HOST=mdw-2; export GPTRANSFER_SOURCE_PORT=5432; export GPTRANSFER_SOURCE_USER=gpadmin;
     on_success:
-      <<: *ccp_destroy_2_cluster
+      <<: *ccp_destroy_two_clusters
   ensure:
-    <<: *set_failed_2_cluster
+    <<: *set_failed_two_clusters
 
 - name: DPM_gptransfer-5x-to-5x
   plan:
@@ -3365,9 +3366,9 @@ jobs:
       BEHAVE_FLAGS: --tags=gptransfer --tags=-skip_source_5
       CUSTOM_ENV: export GPTRANSFER_DEST_HOST=mdw; export GPTRANSFER_DEST_PORT=5432; export GPTRANSFER_DEST_USER=gpadmin; export GPTRANSFER_MAP_FILE=/tmp/source_map_file; export GPTRANSFER_SOURCE_HOST=mdw-2; export GPTRANSFER_SOURCE_PORT=5432; export GPTRANSFER_SOURCE_USER=gpadmin;
     on_success:
-      <<: *ccp_destroy_2_cluster
+      <<: *ccp_destroy_two_clusters
   ensure:
-    <<: *set_failed_2_cluster
+    <<: *set_failed_two_clusters
 
 - name: gate_dpm_end
   plan:

concourse/pipelines/templates/gpdb-tpl.yml

@@ -345,6 +345,7 @@ resources:
 
 {% endif %}
 {% if "DPM" in test_sections %}
+# a second cluster for gptransfer tests
 - name: terraform2
   type: terraform
   source:
@@ -777,7 +778,7 @@ ccp_destroy_anchor: &ccp_destroy
   get_params:
     action: destroy
 
-ccp_destroy_2_cluster_anchor: &ccp_destroy_2_cluster
+ccp_destroy_two_clusters_anchor: &ccp_destroy_two_clusters
   do:
   - *ccp_destroy
   - put: terraform2
@@ -840,7 +841,7 @@ set_failed_anchor: &set_failed
         BUCKET_PATH: clusters/
         BUCKET_NAME: {{tf-bucket-name}}
 
-set_failed_anchor_2: &set_failed_2_cluster
+set_failed_anchor_two_clusters: &set_failed_two_clusters
   do:
   - *set_failed
   - task: on_failure_set_failed
@@ -2907,9 +2908,9 @@ jobs:
       BEHAVE_FLAGS: --tags=gptransfer --tags=-skip_source_43
       CUSTOM_ENV: export GPTRANSFER_DEST_HOST=mdw; export GPTRANSFER_DEST_PORT=5432; export GPTRANSFER_DEST_USER=gpadmin; export GPTRANSFER_MAP_FILE=/tmp/source_map_file; export GPTRANSFER_SOURCE_HOST=mdw-2; export GPTRANSFER_SOURCE_PORT=5432; export GPTRANSFER_SOURCE_USER=gpadmin;
     on_success:
-      <<: *ccp_destroy_2_cluster
+      <<: *ccp_destroy_two_clusters
   ensure:
-    <<: *set_failed_2_cluster
+    <<: *set_failed_two_clusters
 
 - name: DPM_gptransfer-5x-to-5x
   plan:
@@ -2989,9 +2990,9 @@ jobs:
       BEHAVE_FLAGS: --tags=gptransfer --tags=-skip_source_5
       CUSTOM_ENV: export GPTRANSFER_DEST_HOST=mdw; export GPTRANSFER_DEST_PORT=5432; export GPTRANSFER_DEST_USER=gpadmin; export GPTRANSFER_MAP_FILE=/tmp/source_map_file; export GPTRANSFER_SOURCE_HOST=mdw-2; export GPTRANSFER_SOURCE_PORT=5432; export GPTRANSFER_SOURCE_USER=gpadmin;
     on_success:
-      <<: *ccp_destroy_2_cluster
+      <<: *ccp_destroy_two_clusters
   ensure:
-    <<: *set_failed_2_cluster
+    <<: *set_failed_two_clusters
 
 - name: gate_dpm_end
   plan: