Update centos6 build jobs in gpdb_master to use new image

In order to provide better tracking and management of build-time
dependencies for GPDB6, a new Docker image is being produced in the
gp-image-baking pipeline. This commit updates the enterprise build jobs
in the master pipeline to reference the new container image; the OSS
build jobs are not modified. This change is in preparation for the
creation of the 6X_STABLE branch.

The Docker images used to build enterprise GPDB for other platforms will
be updated in subsequent commits.
Co-authored-by: NJimmy Yih <jyih@pivotal.io>
Co-authored-by: NTaylor Vesely <tvesely@pivotal.io>

concourse/pipelines/gpdb_master-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-12-07 11:01:37.942485
+## Generated by gen_pipeline.py at: 2018-12-04 22:35:28.214653
 ## Template file: gpdb-tpl.yml
 ## OS Types: ['centos6', 'centos7', 'sles', 'aix7', 'win', 'ubuntu16']
 ## Test Sections: ['ICW', 'Replication', 'ResourceGroups', 'Interconnect', 'CLI', 'UD', 'AA', 'Extensions']
@@ -344,7 +344,13 @@ resources:
     branch: ((debian-release-git-branch))
     uri: ((debian-release-git-remote))
 
-- name: centos-gpdb-dev-6
+- name: centos-gpdb-build-6
+  type: docker-image
+  source:
+    repository: pivotaldata/centos6-build
+    tag: gpdb6-latest
+
+- name: centos-gpdb-test-6
   type: docker-image
   source:
     repository: pivotaldata/centos-gpdb-dev
@@ -696,10 +702,10 @@ jobs:
     - get: reduced-frequency-trigger
       trigger: ((reduced-frequency-trigger-flag))
     - get: gpaddon_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-build-6
   - task: sync_tools
     file: gpdb_src/concourse/tasks/sync_tools.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-build-6
     params:
       IVYREPO_HOST: {{ivyrepo_host}}
       IVYREPO_REALM: {{ivyrepo_realm}}
@@ -711,7 +717,7 @@ jobs:
       TASK_OS_VERSION: 6
   - task: compile_gpdb
     file: gpdb_src/concourse/tasks/compile_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-build-6
     params:
       CONFIGURE_FLAGS: {{configure_flags}}
       TARGET_OS: centos
@@ -826,9 +832,9 @@ jobs:
       trigger: ((reduced-frequency-trigger-flag))
     - get: gpdb_src
       trigger: ((gpdb_src-trigger-flag))
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: compile_gpdb
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     file: gpdb_src/concourse/tasks/compile_gpdb_open_source_centos.yml
     params:
         CONFIGURE_FLAGS: {{configure_flags}}
@@ -845,10 +851,10 @@ jobs:
       trigger: true
     - get: gpaddon_src
       resource: gpaddon_src_binary_swap
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-build-6
   - task: compile_gpdb
     file: gpdb_src/concourse/tasks/compile_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-build-6
     params:
       IVYREPO_HOST: {{ivyrepo_host}}
       IVYREPO_REALM: {{ivyrepo_realm}}
@@ -872,10 +878,10 @@ jobs:
       trigger: true
     - get: gpdb_src
     - get: gpaddon_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-build-6
   - task: compile_gpdb_aix7_remote
     file: gpdb_src/concourse/tasks/compile_gpdb_remote.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-build-6
     params:
       REMOTE_HOST: {{remote_host_build}}
       REMOTE_PORT: {{remote_port_build}}
@@ -913,12 +919,12 @@ jobs:
       passed:
       - compile_gpdb_centos6
       resource: bin_gpdb_centos6
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
     - put: aix_environments
       params: {acquire: true}
   - task: ic_gpdb_cl
     file: gpdb_src/concourse/tasks/ic_gpdb_remote.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       BLD_TARGETS: "clients loaders"
       REMOTE_HOST: {{remote_host_test}}
@@ -929,7 +935,7 @@ jobs:
       do:
       - task: cleanup_aix
         file: gpdb_src/concourse/tasks/aix_remote_cleanup.yml
-        image: centos-gpdb-dev-6
+        image: centos-gpdb-test-6
         params:
           REMOTE_HOST: {{remote_host_test}}
           REMOTE_PORT: {{remote_port_test}}
@@ -960,10 +966,10 @@ jobs:
       passed: [compile_gpdb_binary_swap_centos6]
       resource: binary_swap_gpdb_centos6
       trigger: true
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: ic_gpdb
     file: gpdb_src/concourse/tasks/ic_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=off' installcheck-world
       TEST_OS: centos
@@ -979,10 +985,10 @@ jobs:
       resource: bin_gpdb_centos6
       passed: [compile_gpdb_centos6]
       trigger: true
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: ic_gpdb
     file: gpdb_src/concourse/tasks/ic_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=on' installcheck-world
       TEST_OS: centos
@@ -1001,10 +1007,10 @@ jobs:
       resource: bin_gpdb_centos6
       passed: [compile_gpdb_centos6]
       trigger: true
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: ic_gpdb
     file: gpdb_src/concourse/tasks/ic_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=on' installcheck-world
       BLDWRAP_POSTGRES_CONF_ADDONS: optimizer_use_gpdb_allocators=on
@@ -1020,10 +1026,10 @@ jobs:
       resource: bin_gpdb_centos6
       passed: [compile_gpdb_centos6]
       trigger: true
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: ic_gpdb
     file: gpdb_src/concourse/tasks/ic_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       MAKE_TEST_COMMAND: -k PGOPTIONS='-c gp_interconnect_type=tcp -c optimizer=off' installcheck-world
       TEST_OS: centos
@@ -1228,7 +1234,7 @@ jobs:
       passed: [compile_gpdb_sles11]
       trigger: true
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - put: terraform
     params:
       <<: *ccp_default_params
@@ -1249,7 +1255,7 @@ jobs:
     file: ccp_src/ci/tasks/gpinitsystem.yml
   - task: run_tests
     file: gpdb_src/concourse/tasks/ic_gpdb_sles12.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=on' installcheck-world
       TEST_OS: sles12
@@ -1268,7 +1274,7 @@ jobs:
       passed: [compile_gpdb_sles11]
       trigger: true
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - put: terraform
     params:
       <<: *ccp_default_params
@@ -1289,7 +1295,7 @@ jobs:
     file: ccp_src/ci/tasks/gpinitsystem.yml
   - task: run_tests
     file: gpdb_src/concourse/tasks/ic_gpdb_sles12.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=off' installcheck-world
       TEST_OS: sles12
@@ -1411,7 +1417,7 @@ jobs:
       passed: [gate_replication_start]
       trigger: true
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - put: terraform
     params:
       <<: *ccp_default_params
@@ -1425,7 +1431,7 @@ jobs:
     file: ccp_src/ci/tasks/gpinitsystem.yml
   - task: run_tests
     file: gpdb_src/concourse/tasks/run_tinc.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       TINC_TARGET: walrep_2
     on_success:
@@ -1443,10 +1449,10 @@ jobs:
       resource: bin_gpdb_centos6
       passed: [gate_replication_start]
       trigger: true
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: ic_gpdb
     file: gpdb_src/concourse/tasks/ic_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       MAKE_TEST_COMMAND: "-C src/test/regress && make -C src/test/walrep install installcheck"
       TEST_OS: centos
@@ -1469,10 +1475,10 @@ jobs:
       passed: [compile_gpdb_centos6]
       resource: bin_gpdb_centos6
       trigger: true
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: ic_gpdb
     file: gpdb_src/concourse/tasks/ic_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=off'
         BUILD_TYPE=((rc-build-type)) -C src/test/regress installcheck-icudp
@@ -1520,7 +1526,7 @@ jobs:
       passed: [gate_resource_groups_start]
       trigger: true
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
     - get: binary_swap_gpdb
       passed: [gate_resource_groups_start]
       resource: binary_swap_gpdb_centos6
@@ -1539,7 +1545,7 @@ jobs:
     file: ccp_src/ci/tasks/gpinitsystem.yml
   - task: run_tests
     file: gpdb_src/concourse/tasks/ic_gpdb_resgroup.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       TEST_OS: centos6
     on_success:
@@ -1557,7 +1563,7 @@ jobs:
       passed: [gate_resource_groups_start]
       trigger: true
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
     - get: binary_swap_gpdb
       passed: [gate_resource_groups_start]
       resource: binary_swap_gpdb_centos6
@@ -1578,7 +1584,7 @@ jobs:
     file: ccp_src/ci/tasks/gpinitsystem.yml
   - task: run_tests
     file: gpdb_src/concourse/tasks/ic_gpdb_resgroup.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       TEST_OS: centos7
     on_success:
@@ -1596,7 +1602,7 @@ jobs:
       passed: [gate_resource_groups_start]
       trigger: true
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - put: terraform
     params:
       <<: *ccp_default_params
@@ -1615,7 +1621,7 @@ jobs:
     file: ccp_src/ci/tasks/gpinitsystem.yml
   - task: run_tests
     file: gpdb_src/concourse/tasks/ic_gpdb_resgroup.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       TEST_OS: sles12
     on_success:
@@ -1656,7 +1662,7 @@ jobs:
       passed: [gate_cli_start]
       trigger: true
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - put: terraform
     params:
       <<: *ccp_default_params
@@ -1674,7 +1680,7 @@ jobs:
       SECOND_BINARY_INSTALL_LOCATION: /tmp/gppkg_migrate
   - task: run_tests
     file: gpdb_src/concourse/tasks/run_behave.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       BEHAVE_FLAGS: --tags=gppkg
     on_success:
@@ -1695,7 +1701,7 @@ jobs:
       passed: [gate_cli_start]
       trigger: true
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - put: terraform
     params:
       <<: *ccp_default_params
@@ -1709,7 +1715,7 @@ jobs:
     file: ccp_src/ci/tasks/gpinitsystem.yml
   - task: run_tests
     file: gpdb_src/concourse/tasks/run_behave.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       BEHAVE_FLAGS: --tags=gprecoverseg
     on_success:
@@ -1730,7 +1736,7 @@ jobs:
       passed: [gate_cli_start]
       trigger: true
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - put: terraform
     params:
       <<: *ccp_default_params
@@ -1744,7 +1750,7 @@ jobs:
     file: ccp_src/ci/tasks/gpinitsystem.yml
   - task: run_tests
     file: gpdb_src/concourse/tasks/run_behave.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       BEHAVE_FLAGS: --tags=gpcheckcat
     on_success:
@@ -1765,7 +1771,7 @@ jobs:
       passed: [gate_cli_start]
       trigger: true
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - put: terraform
     params:
       <<: *ccp_default_params
@@ -1779,7 +1785,7 @@ jobs:
     file: ccp_src/ci/tasks/gpinitsystem.yml
   - task: run_tests
     file: gpdb_src/concourse/tasks/run_behave.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       BEHAVE_FLAGS: --tags=gpinitstandby
     on_success:
@@ -1800,7 +1806,7 @@ jobs:
       passed: [gate_cli_start]
       trigger: true
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - put: terraform
     params:
       <<: *ccp_default_params
@@ -1814,7 +1820,7 @@ jobs:
     file: ccp_src/ci/tasks/gpinitsystem.yml
   - task: run_tests
     file: gpdb_src/concourse/tasks/run_behave.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       BEHAVE_FLAGS: --tags=gpactivatestandby
     on_success:
@@ -1834,10 +1840,10 @@ jobs:
       resource: bin_gpdb_centos6
       passed: [gate_cli_start]
       trigger: true
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: gpcheck_as_gpadmin
     file: gpdb_src/concourse/tasks/behave_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       BEHAVE_TAGS: gpcheck_as_gpadmin
       GPCHECK_SETUP: true
@@ -1847,7 +1853,7 @@ jobs:
   - aggregate: *gets_for_behave
   - task: analyzedb
     file: gpdb_src/concourse/tasks/behave_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       BEHAVE_TAGS: analyzedb
 
@@ -1856,7 +1862,7 @@ jobs:
   - aggregate: *gets_for_behave
   - task: gpperfmon
     file: gpdb_src/concourse/tasks/behave_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       BEHAVE_TAGS: gpperfmon
 
@@ -1865,7 +1871,7 @@ jobs:
   - aggregate: *gets_for_behave
   - task: gpinitsystem
     file: gpdb_src/concourse/tasks/behave_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       BEHAVE_TAGS: gpinitsystem
 
@@ -1878,10 +1884,10 @@ jobs:
       resource: bin_gpdb_centos6
       passed: [gate_cli_start]
       trigger: true
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: check_centos
     file: gpdb_src/concourse/tasks/gpMgmt_check_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       TEST_OS: centos
 
@@ -1898,7 +1904,7 @@ jobs:
       passed: [gate_cli_start]
       trigger: true
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - put: terraform
     params:
       <<: *ccp_default_params
@@ -1913,7 +1919,7 @@ jobs:
     file: ccp_src/ci/tasks/gpinitsystem.yml
   - task: run_tests
     file: gpdb_src/concourse/tasks/run_behave.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       BEHAVE_FLAGS: --tags=gpaddmirrors
     on_success:
@@ -1934,7 +1940,7 @@ jobs:
       passed: [gate_icw_end]
       trigger: true
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
     - get: icw_gporca_centos6_dump
       passed: [gate_icw_end]
   - put: terraform
@@ -1949,13 +1955,13 @@ jobs:
       <<: *ccp_gen_cluster_default_params
   - task: pre_run_test_setup
     file: gpdb_src/concourse/tasks/setup_for_gpexpand_to_make_new_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     input_mapping: {sqldump: icw_gporca_centos6_dump}
   - task: run_tests
     file: gpdb_src/concourse/tasks/run_behave.yml
     params:
       BEHAVE_FLAGS: --tags=gpexpand
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     on_success:
       <<: *ccp_destroy
   ensure:
@@ -1971,7 +1977,7 @@ jobs:
       passed: [gate_cli_start]
       trigger: true
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   # The separate clusters can be created in parallel with the aggregate and do blocks
   #  The terraform put and gen cluster that correspond must still happen serially
   - aggregate:
@@ -2054,7 +2060,7 @@ jobs:
           source gpdb_src/concourse/scripts/transfer_utils.sh; setup_gptransfer
   - task: run_gptransfer_tests
     file: gpdb_src/concourse/tasks/run_behave.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       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;
@@ -2077,7 +2083,7 @@ jobs:
       trigger: true
     - get: icw_gporca_centos6_dump
       passed: [icw_gporca_centos6]
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
     - get: ccp_src
   - put: terraform
     params:
@@ -2135,10 +2141,10 @@ jobs:
       passed: [gate_ud_start]
       trigger: true
       resource: bin_gpdb_centos6
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: regression_tests_gphdfs
     file: gpdb_src/concourse/tasks/regression_tests_gphdfs.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       TARGET_OS: centos
       TARGET_OS_VERSION: 6
@@ -2157,7 +2163,7 @@ jobs:
       trigger: true
       resource: bin_gpdb_centos6
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - put: terraform
     params:
       <<: *ccp_default_params
@@ -2172,7 +2178,7 @@ jobs:
       <<: *ccp_gen_cluster_default_params
   - task: regression_tests_gphdfs_mapr
     file: gpdb_src/concourse/tasks/regression_tests_gphdfs_mapr.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       TARGET_OS: centos
       TARGET_OS_VERSION: 6
@@ -2217,10 +2223,10 @@ jobs:
       passed: [gate_advanced_analytics_start]
     - get: bin_gpdb_centos7
       passed: [gate_advanced_analytics_start]
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-build-6
   - task: build_madlib_gppkg_from_source
     file: madlib_ci/concourse/tasks/madlib_build_gppkg_from_source.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-build-6
     params:
       TEST_OS: centos6
       DB_TYPE: gpdb6
@@ -2239,13 +2245,13 @@ jobs:
     - get: bin_gpdb
       resource: bin_gpdb_centos6
       passed: [madlib_build_gppkg]
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
     - get: madlib_gppkg
       passed: [madlib_build_gppkg]
       trigger: true
   - task: MADlib_Test_gppkg
     file: madlib_ci/concourse/tasks/madlib_test_gppkg.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       TEST_OS: centos
       ORCA: "off"
@@ -2260,13 +2266,13 @@ jobs:
     - get: bin_gpdb
       resource: bin_gpdb_centos6
       passed: [madlib_build_gppkg]
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
     - get: madlib_gppkg
       passed: [madlib_build_gppkg]
       trigger: true
   - task: MADlib_Test_gppkg
     file: madlib_ci/concourse/tasks/madlib_test_gppkg.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       TEST_OS: centos
       ORCA: "on"
@@ -2467,18 +2473,18 @@ jobs:
       trigger: true
     - get: bin_gpdb_centos6
       passed: [compile_gpdb_centos6]
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - aggregate:
     - task: unit_tests_gpcloud
       file: gpdb_src/concourse/tasks/unit_tests_gpcloud.yml
-      image: centos-gpdb-dev-6
+      image: centos-gpdb-test-6
       params:
         TARGET_OS: centos
     - task: regression_tests_gpcloud_centos
       input_mapping:
         bin_gpdb: bin_gpdb_centos6
       file: gpdb_src/concourse/tasks/regression_tests_gpcloud.yml
-      image: centos-gpdb-dev-6
+      image: centos-gpdb-test-6
       params:
         gpcloud_access_key_id: {{gpcloud-access-key-id}}
         gpcloud_secret_access_key: {{gpcloud-secret-access-key}}
@@ -2487,7 +2493,7 @@ jobs:
       input_mapping:
         bin_gpdb: bin_gpdb_centos6
       file: gpdb_src/concourse/tasks/gpcheckcloud_tests_gpcloud.yml
-      image: centos-gpdb-dev-6
+      image: centos-gpdb-test-6
       params:
         gpcloud_access_key_id: {{gpcloud-access-key-id}}
         gpcloud_secret_access_key: {{gpcloud-secret-access-key}}

concourse/pipelines/templates/gpdb-tpl.yml

@@ -457,7 +457,13 @@ resources:
 
 {% endif %}
 {% if "centos6" in os_types or "sles" in os_types or "aix7" in os_types %}
-- name: centos-gpdb-dev-6
+- name: centos-gpdb-build-6
+  type: docker-image
+  source:
+    repository: pivotaldata/centos6-build
+    tag: gpdb6-latest
+
+- name: centos-gpdb-test-6
   type: docker-image
   source:
     repository: pivotaldata/centos-gpdb-dev
@@ -835,10 +841,10 @@ jobs:
     - get: reduced-frequency-trigger
       trigger: ((reduced-frequency-trigger-flag))
     - get: gpaddon_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-build-6
   - task: sync_tools
     file: gpdb_src/concourse/tasks/sync_tools.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-build-6
     params:
       IVYREPO_HOST: {{ivyrepo_host}}
       IVYREPO_REALM: {{ivyrepo_realm}}
@@ -850,7 +856,7 @@ jobs:
       TASK_OS_VERSION: 6
   - task: compile_gpdb
     file: gpdb_src/concourse/tasks/compile_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-build-6
     params:
       CONFIGURE_FLAGS: {{configure_flags}}
       TARGET_OS: centos
@@ -973,9 +979,9 @@ jobs:
       trigger: ((reduced-frequency-trigger-flag))
     - get: gpdb_src
       trigger: ((gpdb_src-trigger-flag))
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: compile_gpdb
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     file: gpdb_src/concourse/tasks/compile_gpdb_open_source_centos.yml
     params:
         CONFIGURE_FLAGS: {{configure_flags}}
@@ -994,10 +1000,10 @@ jobs:
       trigger: true
     - get: gpaddon_src
       resource: gpaddon_src_binary_swap
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-build-6
   - task: compile_gpdb
     file: gpdb_src/concourse/tasks/compile_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-build-6
     params:
       IVYREPO_HOST: {{ivyrepo_host}}
       IVYREPO_REALM: {{ivyrepo_realm}}
@@ -1023,10 +1029,10 @@ jobs:
       trigger: true
     - get: gpdb_src
     - get: gpaddon_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-build-6
   - task: compile_gpdb_aix7_remote
     file: gpdb_src/concourse/tasks/compile_gpdb_remote.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-build-6
     params:
       REMOTE_HOST: {{remote_host_build}}
       REMOTE_PORT: {{remote_port_build}}
@@ -1064,12 +1070,12 @@ jobs:
       passed:
       - compile_gpdb_centos6
       resource: bin_gpdb_centos6
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
     - put: aix_environments
       params: {acquire: true}
   - task: ic_gpdb_cl
     file: gpdb_src/concourse/tasks/ic_gpdb_remote.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       BLD_TARGETS: "clients loaders"
       REMOTE_HOST: {{remote_host_test}}
@@ -1080,7 +1086,7 @@ jobs:
       do:
       - task: cleanup_aix
         file: gpdb_src/concourse/tasks/aix_remote_cleanup.yml
-        image: centos-gpdb-dev-6
+        image: centos-gpdb-test-6
         params:
           REMOTE_HOST: {{remote_host_test}}
           REMOTE_PORT: {{remote_port_test}}
@@ -1114,10 +1120,10 @@ jobs:
       passed: [compile_gpdb_binary_swap_centos6]
       resource: binary_swap_gpdb_centos6
       trigger: [[ test_trigger ]]
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: ic_gpdb
     file: gpdb_src/concourse/tasks/ic_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=off' installcheck-world
       TEST_OS: centos
@@ -1133,10 +1139,10 @@ jobs:
       resource: bin_gpdb_centos6
       passed: [compile_gpdb_centos6]
       trigger: [[ test_trigger ]]
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: ic_gpdb
     file: gpdb_src/concourse/tasks/ic_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=on' installcheck-world
       TEST_OS: centos
@@ -1155,10 +1161,10 @@ jobs:
       resource: bin_gpdb_centos6
       passed: [compile_gpdb_centos6]
       trigger: [[ test_trigger ]]
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: ic_gpdb
     file: gpdb_src/concourse/tasks/ic_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=on' installcheck-world
       BLDWRAP_POSTGRES_CONF_ADDONS: optimizer_use_gpdb_allocators=on
@@ -1174,10 +1180,10 @@ jobs:
       resource: bin_gpdb_centos6
       passed: [compile_gpdb_centos6]
       trigger: [[ test_trigger ]]
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: ic_gpdb
     file: gpdb_src/concourse/tasks/ic_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       MAKE_TEST_COMMAND: -k PGOPTIONS='-c gp_interconnect_type=tcp -c optimizer=off' installcheck-world
       TEST_OS: centos
@@ -1386,7 +1392,7 @@ jobs:
       passed: [compile_gpdb_sles11]
       trigger: true
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - put: terraform
     params:
       <<: *ccp_default_params
@@ -1407,7 +1413,7 @@ jobs:
     file: ccp_src/ci/tasks/gpinitsystem.yml
   - task: run_tests
     file: gpdb_src/concourse/tasks/ic_gpdb_sles12.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=on' installcheck-world
       TEST_OS: sles12
@@ -1426,7 +1432,7 @@ jobs:
       passed: [compile_gpdb_sles11]
       trigger: true
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - put: terraform
     params:
       <<: *ccp_default_params
@@ -1447,7 +1453,7 @@ jobs:
     file: ccp_src/ci/tasks/gpinitsystem.yml
   - task: run_tests
     file: gpdb_src/concourse/tasks/ic_gpdb_sles12.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=off' installcheck-world
       TEST_OS: sles12
@@ -1597,7 +1603,7 @@ jobs:
       passed: [gate_replication_start]
       trigger: [[ test_trigger ]]
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - put: terraform
     params:
       <<: *ccp_default_params
@@ -1611,7 +1617,7 @@ jobs:
     file: ccp_src/ci/tasks/gpinitsystem.yml
   - task: run_tests
     file: gpdb_src/concourse/tasks/run_tinc.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       TINC_TARGET: [[ test_name ]]
     on_success:
@@ -1630,10 +1636,10 @@ jobs:
       resource: bin_gpdb_centos6
       passed: [gate_replication_start]
       trigger: [[ test_trigger ]]
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: ic_gpdb
     file: gpdb_src/concourse/tasks/ic_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       MAKE_TEST_COMMAND: "-C src/test/regress && make -C src/test/walrep install installcheck"
       TEST_OS: centos
@@ -1659,10 +1665,10 @@ jobs:
       passed: [compile_gpdb_centos6]
       resource: bin_gpdb_centos6
       trigger: [[ test_trigger ]]
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: ic_gpdb
     file: gpdb_src/concourse/tasks/ic_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=off'
         BUILD_TYPE=((rc-build-type)) -C src/test/regress installcheck-icudp
@@ -1723,7 +1729,7 @@ jobs:
       passed: [gate_resource_groups_start]
       trigger: [[ test_trigger ]]
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
     - get: binary_swap_gpdb
       passed: [gate_resource_groups_start]
       resource: binary_swap_gpdb_centos6
@@ -1742,7 +1748,7 @@ jobs:
     file: ccp_src/ci/tasks/gpinitsystem.yml
   - task: run_tests
     file: gpdb_src/concourse/tasks/ic_gpdb_resgroup.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       TEST_OS: centos6
     on_success:
@@ -1761,7 +1767,7 @@ jobs:
       passed: [gate_resource_groups_start]
       trigger: [[ test_trigger ]]
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
     - get: binary_swap_gpdb
       passed: [gate_resource_groups_start]
       resource: binary_swap_gpdb_centos6
@@ -1782,7 +1788,7 @@ jobs:
     file: ccp_src/ci/tasks/gpinitsystem.yml
   - task: run_tests
     file: gpdb_src/concourse/tasks/ic_gpdb_resgroup.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       TEST_OS: centos7
     on_success:
@@ -1802,7 +1808,7 @@ jobs:
       passed: [gate_resource_groups_start]
       trigger: true
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - put: terraform
     params:
       <<: *ccp_default_params
@@ -1821,7 +1827,7 @@ jobs:
     file: ccp_src/ci/tasks/gpinitsystem.yml
   - task: run_tests
     file: gpdb_src/concourse/tasks/ic_gpdb_resgroup.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       TEST_OS: sles12
     on_success:
@@ -1865,7 +1871,7 @@ jobs:
       passed: [gate_cli_start]
       trigger: [[ test_trigger ]]
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - put: terraform
     params:
       <<: *ccp_default_params
@@ -1883,7 +1889,7 @@ jobs:
       SECOND_BINARY_INSTALL_LOCATION: /tmp/gppkg_migrate
   - task: run_tests
     file: gpdb_src/concourse/tasks/run_behave.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       BEHAVE_FLAGS: --tags=gppkg
     on_success:
@@ -1905,7 +1911,7 @@ jobs:
       passed: [gate_cli_start]
       trigger: [[ test_trigger ]]
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - put: terraform
     params:
       <<: *ccp_default_params
@@ -1919,7 +1925,7 @@ jobs:
     file: ccp_src/ci/tasks/gpinitsystem.yml
   - task: run_tests
     file: gpdb_src/concourse/tasks/run_behave.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       BEHAVE_FLAGS: --tags=[[ test_name ]]
     on_success:
@@ -1940,10 +1946,10 @@ jobs:
       resource: bin_gpdb_centos6
       passed: [gate_cli_start]
       trigger: [[ test_trigger ]]
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: gpcheck_as_gpadmin
     file: gpdb_src/concourse/tasks/behave_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       BEHAVE_TAGS: gpcheck_as_gpadmin
       GPCHECK_SETUP: true
@@ -1954,7 +1960,7 @@ jobs:
   - aggregate: *gets_for_behave
   - task: [[ test_name ]]
     file: gpdb_src/concourse/tasks/behave_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       BEHAVE_TAGS: [[ test_name ]]
 
@@ -1968,10 +1974,10 @@ jobs:
       resource: bin_gpdb_centos6
       passed: [gate_cli_start]
       trigger: [[ test_trigger ]]
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: check_centos
     file: gpdb_src/concourse/tasks/gpMgmt_check_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       TEST_OS: centos
 
@@ -1988,7 +1994,7 @@ jobs:
       passed: [gate_cli_start]
       trigger: [[ test_trigger ]]
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - put: terraform
     params:
       <<: *ccp_default_params
@@ -2003,7 +2009,7 @@ jobs:
     file: ccp_src/ci/tasks/gpinitsystem.yml
   - task: run_tests
     file: gpdb_src/concourse/tasks/run_behave.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       BEHAVE_FLAGS: --tags=gpaddmirrors
     on_success:
@@ -2024,7 +2030,7 @@ jobs:
       passed: [gate_icw_end]
       trigger: [[ test_trigger ]]
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
     - get: icw_gporca_centos6_dump
       passed: [gate_icw_end]
   - put: terraform
@@ -2039,13 +2045,13 @@ jobs:
       <<: *ccp_gen_cluster_default_params
   - task: pre_run_test_setup
     file: gpdb_src/concourse/tasks/setup_for_gpexpand_to_make_new_gpdb.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     input_mapping: {sqldump: icw_gporca_centos6_dump}
   - task: run_tests
     file: gpdb_src/concourse/tasks/run_behave.yml
     params:
       BEHAVE_FLAGS: --tags=gpexpand
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     on_success:
       <<: *ccp_destroy
   ensure:
@@ -2061,7 +2067,7 @@ jobs:
       passed: [gate_cli_start]
       trigger: [[ test_trigger ]]
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   # The separate clusters can be created in parallel with the aggregate and do blocks
   #  The terraform put and gen cluster that correspond must still happen serially
   - aggregate:
@@ -2144,7 +2150,7 @@ jobs:
           source gpdb_src/concourse/scripts/transfer_utils.sh; setup_gptransfer
   - task: run_gptransfer_tests
     file: gpdb_src/concourse/tasks/run_behave.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       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;
@@ -2168,7 +2174,7 @@ jobs:
       trigger: [[ test_trigger ]]
     - get: icw_gporca_centos6_dump
       passed: [icw_gporca_centos6]
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
     - get: ccp_src
   - put: terraform
     params:
@@ -2228,10 +2234,10 @@ jobs:
       passed: [gate_ud_start]
       trigger: [[ test_trigger ]]
       resource: bin_gpdb_centos6
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - task: regression_tests_gphdfs
     file: gpdb_src/concourse/tasks/regression_tests_gphdfs.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       TARGET_OS: centos
       TARGET_OS_VERSION: 6
@@ -2250,7 +2256,7 @@ jobs:
       trigger: [[ test_trigger ]]
       resource: bin_gpdb_centos6
     - get: ccp_src
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - put: terraform
     params:
       <<: *ccp_default_params
@@ -2265,7 +2271,7 @@ jobs:
       <<: *ccp_gen_cluster_default_params
   - task: regression_tests_gphdfs_mapr
     file: gpdb_src/concourse/tasks/regression_tests_gphdfs_mapr.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       TARGET_OS: centos
       TARGET_OS_VERSION: 6
@@ -2321,10 +2327,10 @@ jobs:
       passed: [gate_advanced_analytics_start]
     - get: bin_gpdb_centos7
       passed: [gate_advanced_analytics_start]
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-build-6
   - task: build_madlib_gppkg_from_source
     file: madlib_ci/concourse/tasks/madlib_build_gppkg_from_source.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-build-6
     params:
       TEST_OS: centos6
       DB_TYPE: gpdb6
@@ -2345,13 +2351,13 @@ jobs:
     - get: bin_gpdb
       resource: bin_gpdb_centos6
       passed: [madlib_build_gppkg]
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
     - get: madlib_gppkg
       passed: [madlib_build_gppkg]
       trigger: true
   - task: MADlib_Test_gppkg
     file: madlib_ci/concourse/tasks/madlib_test_gppkg.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       TEST_OS: centos
       ORCA: "off"
@@ -2366,13 +2372,13 @@ jobs:
     - get: bin_gpdb
       resource: bin_gpdb_centos6
       passed: [madlib_build_gppkg]
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
     - get: madlib_gppkg
       passed: [madlib_build_gppkg]
       trigger: true
   - task: MADlib_Test_gppkg
     file: madlib_ci/concourse/tasks/madlib_test_gppkg.yml
-    image: centos-gpdb-dev-6
+    image: centos-gpdb-test-6
     params:
       TEST_OS: centos
       ORCA: "on"
@@ -2575,18 +2581,18 @@ jobs:
       trigger: [[ test_trigger ]]
     - get: bin_gpdb_centos6
       passed: [compile_gpdb_centos6]
-    - get: centos-gpdb-dev-6
+    - get: centos-gpdb-test-6
   - aggregate:
     - task: unit_tests_gpcloud
       file: gpdb_src/concourse/tasks/unit_tests_gpcloud.yml
-      image: centos-gpdb-dev-6
+      image: centos-gpdb-test-6
       params:
         TARGET_OS: centos
     - task: regression_tests_gpcloud_centos
       input_mapping:
         bin_gpdb: bin_gpdb_centos6
       file: gpdb_src/concourse/tasks/regression_tests_gpcloud.yml
-      image: centos-gpdb-dev-6
+      image: centos-gpdb-test-6
       params:
         gpcloud_access_key_id: {{gpcloud-access-key-id}}
         gpcloud_secret_access_key: {{gpcloud-secret-access-key}}
@@ -2595,7 +2601,7 @@ jobs:
       input_mapping:
         bin_gpdb: bin_gpdb_centos6
       file: gpdb_src/concourse/tasks/gpcheckcloud_tests_gpcloud.yml
-      image: centos-gpdb-dev-6
+      image: centos-gpdb-test-6
       params:
         gpcloud_access_key_id: {{gpcloud-access-key-id}}
         gpcloud_secret_access_key: {{gpcloud-secret-access-key}}