diff --git a/README.docker.md b/README.docker.md index f1117ff193dc972a379ffe95873ddfbd08771747..e7b23c40f383b597df04539fbe34da102c33fe62 100644 --- a/README.docker.md +++ b/README.docker.md @@ -21,7 +21,7 @@ To make Greenplum accessible outside of the docker container use the -p switch ( This will proxy connections / requests made to the `` across to `` which will allow Greenplum within docker to receive them. ```bash -docker run -t -v ~/workspace/gpdb:/home/gpadmin/gpdb_src --privileged --security-opt seccomp:unconfined -i pivotaldata/centos7-build:gpdb6-latest bash +docker run -t -v ~/workspace/gpdb:/home/gpadmin/gpdb_src --privileged --security-opt seccomp:unconfined -i pivotaldata/gpdb6-centos7-build:latest bash ``` ## Set up Container Dependencies and the gpadmin User diff --git a/concourse/pipelines/gpdb_master-generated.yml b/concourse/pipelines/gpdb_master-generated.yml index 55aec73125c6bed7aceb134b14ccef0373d15abb..18ef5ad2b51a1d9f7617afa4edb363fde2ba9ed3 100644 --- a/concourse/pipelines/gpdb_master-generated.yml +++ b/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: 2019-02-04 19:45:19.213362 +## Generated by gen_pipeline.py at: 2019-02-04 22:17:41.554273 ## Template file: gpdb-tpl.yml ## OS Types: ['centos6', 'centos7', 'sles', 'aix7', 'win', 'ubuntu16'] ## Test Sections: ['ICW', 'Replication', 'ResourceGroups', 'Interconnect', 'CLI', 'UD', 'AA', 'Extensions'] @@ -365,28 +365,28 @@ resources: json_key: ((gcs-key)) versioned_file: centos7/python-2.7.12.tar.gz -- name: centos6-build-gpdb6 +- name: gpdb6-centos6-build type: docker-image source: - repository: pivotaldata/centos6-build - tag: gpdb6-latest + repository: pivotaldata/gpdb6-centos6-build + tag: latest -- name: centos6-test-gpdb6 +- name: gpdb6-centos6-test type: docker-image source: - repository: pivotaldata/centos6-test - tag: gpdb6-latest -- name: centos7-build-gpdb6 + repository: pivotaldata/gpdb6-centos6-test + tag: latest +- name: gpdb6-centos7-build type: docker-image source: - repository: pivotaldata/centos7-build - tag: gpdb6-latest + repository: pivotaldata/gpdb6-centos7-build + tag: latest -- name: centos7-test-gpdb6 +- name: gpdb6-centos7-test type: docker-image source: - repository: pivotaldata/centos7-test - tag: gpdb6-latest + repository: pivotaldata/gpdb6-centos7-test + tag: latest - name: ubuntu-gpdb-dev-16 type: docker-image @@ -717,7 +717,7 @@ jobs: - get: reduced-frequency-trigger trigger: ((reduced-frequency-trigger-flag)) - get: gpaddon_src - - get: centos6-build-gpdb6 + - get: gpdb6-centos6-build - get: libquicklz-installer resource: libquicklz-centos6 - get: libquicklz-devel-installer @@ -726,7 +726,7 @@ jobs: resource: python-centos6 - task: sync_tools file: gpdb_src/concourse/tasks/sync_tools.yml - image: centos6-build-gpdb6 + image: gpdb6-centos6-build params: IVYREPO_HOST: {{ivyrepo_host}} IVYREPO_REALM: {{ivyrepo_realm}} @@ -738,7 +738,7 @@ jobs: TASK_OS_VERSION: 6 - task: compile_gpdb file: gpdb_src/concourse/tasks/compile_gpdb.yml - image: centos6-build-gpdb6 + image: gpdb6-centos6-build params: CONFIGURE_FLAGS: {{configure_flags}} TARGET_OS: centos @@ -757,7 +757,7 @@ jobs: - get: gpdb_src trigger: ((gpdb_src-trigger-flag)) - get: gpaddon_src - - get: centos7-build-gpdb6 + - get: gpdb6-centos7-build - get: libquicklz-installer resource: libquicklz-centos7 - get: libquicklz-devel-installer @@ -766,7 +766,7 @@ jobs: resource: python-centos7 - task: sync_tools file: gpdb_src/concourse/tasks/sync_tools.yml - image: centos7-build-gpdb6 + image: gpdb6-centos7-build params: IVYREPO_HOST: {{ivyrepo_host}} IVYREPO_REALM: {{ivyrepo_realm}} @@ -777,7 +777,7 @@ jobs: TASK_OS: centos TASK_OS_VERSION: 7 - task: compile_gpdb - image: centos7-build-gpdb6 + image: gpdb6-centos7-build file: gpdb_src/concourse/tasks/compile_gpdb.yml params: CONFIGURE_FLAGS: {{configure_flags}} @@ -797,10 +797,10 @@ jobs: - get: gpdb_src trigger: ((gpdb_src-trigger-flag)) - get: gpaddon_src - - get: centos7-build-gpdb6 + - get: gpdb6-centos7-build - task: sync_tools file: gpdb_src/concourse/tasks/sync_tools.yml - image: centos7-build-gpdb6 + image: gpdb6-centos7-build params: IVYREPO_HOST: {{ivyrepo_host}} IVYREPO_REALM: {{ivyrepo_realm}} @@ -859,9 +859,9 @@ jobs: trigger: ((reduced-frequency-trigger-flag)) - get: gpdb_src trigger: ((gpdb_src-trigger-flag)) - - get: centos6-build-gpdb6 + - get: gpdb6-centos6-build - task: compile_gpdb - image: centos6-build-gpdb6 + image: gpdb6-centos6-build file: gpdb_src/concourse/tasks/compile_gpdb_open_source_centos.yml params: CONFIGURE_FLAGS: {{configure_flags}} @@ -878,7 +878,7 @@ jobs: trigger: true - get: gpaddon_src resource: gpaddon_src_binary_swap - - get: centos6-build-gpdb6 + - get: gpdb6-centos6-build - get: libquicklz-installer resource: libquicklz-centos6 - get: libquicklz-devel-installer @@ -887,7 +887,7 @@ jobs: resource: python-centos6 - task: sync_tools file: gpdb_src/concourse/tasks/sync_tools.yml - image: centos6-build-gpdb6 + image: gpdb6-centos6-build params: IVYREPO_HOST: {{ivyrepo_host}} IVYREPO_REALM: {{ivyrepo_realm}} @@ -899,7 +899,7 @@ jobs: TASK_OS_VERSION: 6 - task: compile_gpdb file: gpdb_src/concourse/tasks/compile_gpdb.yml - image: centos6-build-gpdb6 + image: gpdb6-centos6-build params: CONFIGURE_FLAGS: {{configure_flags}} TARGET_OS: centos @@ -921,10 +921,10 @@ jobs: trigger: true - get: gpdb_src - get: gpaddon_src - - get: centos6-build-gpdb6 + - get: gpdb6-centos6-build - task: compile_gpdb_aix7_remote file: gpdb_src/concourse/tasks/compile_gpdb_remote.yml - image: centos6-build-gpdb6 + image: gpdb6-centos6-build params: REMOTE_HOST: {{remote_host_build}} REMOTE_PORT: {{remote_port_build}} @@ -962,12 +962,12 @@ jobs: passed: - compile_gpdb_centos6 resource: bin_gpdb_centos6 - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - put: aix_environments params: {acquire: true} - task: ic_gpdb_cl file: gpdb_src/concourse/tasks/ic_gpdb_remote.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: BLD_TARGETS: "clients loaders" REMOTE_HOST: {{remote_host_test}} @@ -978,7 +978,7 @@ jobs: do: - task: cleanup_aix file: gpdb_src/concourse/tasks/aix_remote_cleanup.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: REMOTE_HOST: {{remote_host_test}} REMOTE_PORT: {{remote_port_test}} @@ -1009,10 +1009,10 @@ jobs: passed: [compile_gpdb_binary_swap_centos6] resource: binary_swap_gpdb_centos6 trigger: true - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - task: ic_gpdb file: gpdb_src/concourse/tasks/ic_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=off' installcheck-world TEST_OS: centos @@ -1028,10 +1028,10 @@ jobs: resource: bin_gpdb_centos6 passed: [compile_gpdb_centos6] trigger: true - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - task: ic_gpdb file: gpdb_src/concourse/tasks/ic_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=on' installcheck-world TEST_OS: centos @@ -1050,10 +1050,10 @@ jobs: resource: bin_gpdb_centos6 passed: [compile_gpdb_centos6] trigger: true - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - task: ic_gpdb file: gpdb_src/concourse/tasks/ic_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=on' installcheck-world BLDWRAP_POSTGRES_CONF_ADDONS: optimizer_use_gpdb_allocators=on @@ -1069,10 +1069,10 @@ jobs: resource: bin_gpdb_centos6 passed: [compile_gpdb_centos6] trigger: true - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - task: ic_gpdb file: gpdb_src/concourse/tasks/ic_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: MAKE_TEST_COMMAND: -k PGOPTIONS='-c gp_interconnect_type=tcp -c optimizer=off' installcheck-world TEST_OS: centos @@ -1086,10 +1086,10 @@ jobs: resource: bin_gpdb_centos7 passed: [compile_gpdb_centos7] trigger: true - - get: centos7-test-gpdb6 + - get: gpdb6-centos7-test - task: ic_gpdb file: gpdb_src/concourse/tasks/ic_gpdb.yml - image: centos7-test-gpdb6 + image: gpdb6-centos7-test params: MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=on' installcheck-world TEST_OS: centos @@ -1104,10 +1104,10 @@ jobs: passed: [compile_gpdb_centos7] resource: bin_gpdb_centos7 trigger: true - - get: centos7-test-gpdb6 + - get: gpdb6-centos7-test - task: ic_gpdb file: gpdb_src/concourse/tasks/ic_gpdb.yml - image: centos7-test-gpdb6 + image: gpdb6-centos7-test params: MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=off' installcheck-world TEST_OS: centos @@ -1123,16 +1123,16 @@ jobs: passed: [compile_gpdb_centos7] resource: bin_gpdb_centos7 trigger: true - - get: centos7-test-gpdb6 + - get: gpdb6-centos7-test - task: ic_gpdb file: gpdb_src/concourse/tasks/ic_gpdb.yml - image: centos7-test-gpdb6 + image: gpdb6-centos7-test params: MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=off' installcheck-world TEST_OS: centos TEST_BINARY_SWAP: false CONFIGURE_FLAGS: {{configure_flags}} - EXCLUDE_TESTS: instr_in_shmem_setup,instr_in_shmem_terminate,segspace_setup,segspace,segspace_cleanup,cursor,instr_in_shmem,instr_in_shmem_verify,gdd/prepare,gdd/dist-deadlock-01,gdd/dist-deadlock-04,gdd/dist-deadlock-05,gdd/dist-deadlock-06,gdd/dist-deadlock-07,gdd/dist-deadlock-102,gdd/dist-deadlock-103,gdd/dist-deadlock-104,gdd/dist-deadlock-106,gdd/non-lock-105,gdd/non-lock-107,gdd/avoid-qd-deadlock,gdd/prepare-for-local,gdd/local-deadlock-03,gdd/end,concurrent_update_distkeys,concurrent_update_epq + EXCLUDE_TESTS: instr_in_shmem_setup,instr_in_shmem_terminate,segspace_setup,segspace,segspace_cleanup,cursor,instr_in_shmem,instr_in_shmem_verify,gdd/prepare,gdd/dist-deadlock-01,gdd/dist-deadlock-04,gdd/dist-deadlock-05,gdd/dist-deadlock-06,gdd/dist-deadlock-07,gdd/dist-deadlock-102,gdd/dist-deadlock-103,gdd/dist-deadlock-104,gdd/dist-deadlock-106,gdd/non-lock-105,gdd/non-lock-107,gdd/avoid-qd-deadlock,gdd/prepare-for-local,gdd/local-deadlock-03,gdd/end,concurrent_update_distkeys,concurrent_update_epq ONLINE_EXPAND: true - name: icw_gporca_sles11 @@ -1330,10 +1330,10 @@ jobs: passed: [compile_gpdb_centos6] resource: bin_gpdb_centos6 trigger: true - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - task: ic_gpdb file: gpdb_src/concourse/tasks/ic_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=off' BUILD_TYPE=((rc-build-type)) -C src/test/regress installcheck-icudp @@ -1697,10 +1697,10 @@ jobs: resource: bin_gpdb_centos6 passed: [gate_cli_start] trigger: true - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - task: gpcheck_as_gpadmin file: gpdb_src/concourse/tasks/behave_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: BEHAVE_TAGS: gpcheck_as_gpadmin GPCHECK_SETUP: true @@ -1710,7 +1710,7 @@ jobs: - aggregate: *gets_for_behave - task: analyzedb file: gpdb_src/concourse/tasks/behave_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: BEHAVE_TAGS: analyzedb @@ -1719,7 +1719,7 @@ jobs: - aggregate: *gets_for_behave - task: gpperfmon file: gpdb_src/concourse/tasks/behave_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: BEHAVE_TAGS: gpperfmon @@ -1728,7 +1728,7 @@ jobs: - aggregate: *gets_for_behave - task: gpinitsystem file: gpdb_src/concourse/tasks/behave_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: BEHAVE_TAGS: gpinitsystem @@ -1737,7 +1737,7 @@ jobs: - aggregate: *gets_for_behave - task: gpstate file: gpdb_src/concourse/tasks/behave_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: BEHAVE_TAGS: gpstate @@ -1746,7 +1746,7 @@ jobs: - aggregate: *gets_for_behave - task: replication_slots file: gpdb_src/concourse/tasks/behave_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: BEHAVE_TAGS: replication_slots @@ -1759,10 +1759,10 @@ jobs: resource: bin_gpdb_centos6 passed: [gate_cli_start] trigger: true - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - task: check_centos file: gpdb_src/concourse/tasks/gpMgmt_check_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: TEST_OS: centos @@ -1914,10 +1914,10 @@ jobs: passed: [gate_ud_start] trigger: true resource: bin_gpdb_centos6 - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - task: regression_tests_gphdfs file: gpdb_src/concourse/tasks/regression_tests_gphdfs.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: TARGET_OS: centos TARGET_OS_VERSION: 6 @@ -1936,7 +1936,7 @@ jobs: trigger: true resource: bin_gpdb_centos6 - get: ccp_src - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - put: terraform params: <<: *ccp_default_params @@ -1951,7 +1951,7 @@ jobs: <<: *ccp_gen_cluster_default_params - task: regression_tests_gphdfs_mapr file: gpdb_src/concourse/tasks/regression_tests_gphdfs_mapr.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: TARGET_OS: centos TARGET_OS_VERSION: 6 @@ -1996,10 +1996,10 @@ jobs: passed: [gate_advanced_analytics_start] - get: bin_gpdb_centos7 passed: [gate_advanced_analytics_start] - - get: centos6-build-gpdb6 + - get: gpdb6-centos6-build - task: build_madlib_gppkg_from_source file: madlib_ci/concourse/tasks/madlib_build_gppkg_from_source.yml - image: centos6-build-gpdb6 + image: gpdb6-centos6-build params: TEST_OS: centos6 DB_TYPE: gpdb6 @@ -2018,13 +2018,13 @@ jobs: - get: bin_gpdb resource: bin_gpdb_centos6 passed: [madlib_build_gppkg] - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - get: madlib_gppkg passed: [madlib_build_gppkg] trigger: true - task: MADlib_Test_gppkg file: madlib_ci/concourse/tasks/madlib_test_gppkg.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: TEST_OS: centos ORCA: "off" @@ -2039,13 +2039,13 @@ jobs: - get: bin_gpdb resource: bin_gpdb_centos6 passed: [madlib_build_gppkg] - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - get: madlib_gppkg passed: [madlib_build_gppkg] trigger: true - task: MADlib_Test_gppkg file: madlib_ci/concourse/tasks/madlib_test_gppkg.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: TEST_OS: centos ORCA: "on" @@ -2060,13 +2060,13 @@ jobs: - get: bin_gpdb resource: bin_gpdb_centos7 passed: [madlib_build_gppkg] - - get: centos7-test-gpdb6 + - get: gpdb6-centos7-test - get: madlib_gppkg passed: [madlib_build_gppkg] trigger: true - task: MADlib_Test_gppkg file: madlib_ci/concourse/tasks/madlib_test_gppkg.yml - image: centos7-test-gpdb6 + image: gpdb6-centos7-test params: TEST_OS: centos ORCA: "off" @@ -2081,13 +2081,13 @@ jobs: - get: bin_gpdb resource: bin_gpdb_centos7 passed: [madlib_build_gppkg] - - get: centos7-test-gpdb6 + - get: gpdb6-centos7-test - get: madlib_gppkg passed: [madlib_build_gppkg] trigger: true - task: MADlib_Test_gppkg file: madlib_ci/concourse/tasks/madlib_test_gppkg.yml - image: centos7-test-gpdb6 + image: gpdb6-centos7-test params: TEST_OS: centos ORCA: "on" @@ -2243,18 +2243,18 @@ jobs: trigger: true - get: bin_gpdb_centos6 passed: [compile_gpdb_centos6] - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - aggregate: - task: unit_tests_gpcloud file: gpdb_src/concourse/tasks/unit_tests_gpcloud.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test 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: centos6-test-gpdb6 + image: gpdb6-centos6-test params: gpcloud_access_key_id: {{gpcloud-access-key-id}} gpcloud_secret_access_key: {{gpcloud-secret-access-key}} @@ -2263,7 +2263,7 @@ jobs: input_mapping: bin_gpdb: bin_gpdb_centos6 file: gpdb_src/concourse/tasks/gpcheckcloud_tests_gpcloud.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: gpcloud_access_key_id: {{gpcloud-access-key-id}} gpcloud_secret_access_key: {{gpcloud-secret-access-key}} diff --git a/concourse/pipelines/templates/gpdb-tpl.yml b/concourse/pipelines/templates/gpdb-tpl.yml index 757319626af82f207b52ab1f70c17c609f0757be..e93a104a0bca96ccff2b5683b982a0d0af13acda 100644 --- a/concourse/pipelines/templates/gpdb-tpl.yml +++ b/concourse/pipelines/templates/gpdb-tpl.yml @@ -476,30 +476,30 @@ resources: {% endif %} {% if "centos6" in os_types or "sles" in os_types or "aix7" in os_types %} -- name: centos6-build-gpdb6 +- name: gpdb6-centos6-build type: docker-image source: - repository: pivotaldata/centos6-build - tag: gpdb6-latest + repository: pivotaldata/gpdb6-centos6-build + tag: latest -- name: centos6-test-gpdb6 +- name: gpdb6-centos6-test type: docker-image source: - repository: pivotaldata/centos6-test - tag: gpdb6-latest + repository: pivotaldata/gpdb6-centos6-test + tag: latest {% endif %} {% if "centos7" in os_types %} -- name: centos7-build-gpdb6 +- name: gpdb6-centos7-build type: docker-image source: - repository: pivotaldata/centos7-build - tag: gpdb6-latest + repository: pivotaldata/gpdb6-centos7-build + tag: latest -- name: centos7-test-gpdb6 +- name: gpdb6-centos7-test type: docker-image source: - repository: pivotaldata/centos7-test - tag: gpdb6-latest + repository: pivotaldata/gpdb6-centos7-test + tag: latest {% endif %} {% if "ubuntu16" in os_types %} @@ -854,7 +854,7 @@ jobs: - get: reduced-frequency-trigger trigger: ((reduced-frequency-trigger-flag)) - get: gpaddon_src - - get: centos6-build-gpdb6 + - get: gpdb6-centos6-build - get: libquicklz-installer resource: libquicklz-centos6 - get: libquicklz-devel-installer @@ -863,7 +863,7 @@ jobs: resource: python-centos6 - task: sync_tools file: gpdb_src/concourse/tasks/sync_tools.yml - image: centos6-build-gpdb6 + image: gpdb6-centos6-build params: IVYREPO_HOST: {{ivyrepo_host}} IVYREPO_REALM: {{ivyrepo_realm}} @@ -875,7 +875,7 @@ jobs: TASK_OS_VERSION: 6 - task: compile_gpdb file: gpdb_src/concourse/tasks/compile_gpdb.yml - image: centos6-build-gpdb6 + image: gpdb6-centos6-build params: CONFIGURE_FLAGS: {{configure_flags}} TARGET_OS: centos @@ -896,7 +896,7 @@ jobs: - get: gpdb_src trigger: ((gpdb_src-trigger-flag)) - get: gpaddon_src - - get: centos7-build-gpdb6 + - get: gpdb6-centos7-build - get: libquicklz-installer resource: libquicklz-centos7 - get: libquicklz-devel-installer @@ -905,7 +905,7 @@ jobs: resource: python-centos7 - task: sync_tools file: gpdb_src/concourse/tasks/sync_tools.yml - image: centos7-build-gpdb6 + image: gpdb6-centos7-build params: IVYREPO_HOST: {{ivyrepo_host}} IVYREPO_REALM: {{ivyrepo_realm}} @@ -916,7 +916,7 @@ jobs: TASK_OS: centos TASK_OS_VERSION: 7 - task: compile_gpdb - image: centos7-build-gpdb6 + image: gpdb6-centos7-build file: gpdb_src/concourse/tasks/compile_gpdb.yml params: CONFIGURE_FLAGS: {{configure_flags}} @@ -938,10 +938,10 @@ jobs: - get: gpdb_src trigger: ((gpdb_src-trigger-flag)) - get: gpaddon_src - - get: centos7-build-gpdb6 + - get: gpdb6-centos7-build - task: sync_tools file: gpdb_src/concourse/tasks/sync_tools.yml - image: centos7-build-gpdb6 + image: gpdb6-centos7-build params: IVYREPO_HOST: {{ivyrepo_host}} IVYREPO_REALM: {{ivyrepo_realm}} @@ -1004,9 +1004,9 @@ jobs: trigger: ((reduced-frequency-trigger-flag)) - get: gpdb_src trigger: ((gpdb_src-trigger-flag)) - - get: centos6-build-gpdb6 + - get: gpdb6-centos6-build - task: compile_gpdb - image: centos6-build-gpdb6 + image: gpdb6-centos6-build file: gpdb_src/concourse/tasks/compile_gpdb_open_source_centos.yml params: CONFIGURE_FLAGS: {{configure_flags}} @@ -1025,7 +1025,7 @@ jobs: trigger: true - get: gpaddon_src resource: gpaddon_src_binary_swap - - get: centos6-build-gpdb6 + - get: gpdb6-centos6-build - get: libquicklz-installer resource: libquicklz-centos6 - get: libquicklz-devel-installer @@ -1034,7 +1034,7 @@ jobs: resource: python-centos6 - task: sync_tools file: gpdb_src/concourse/tasks/sync_tools.yml - image: centos6-build-gpdb6 + image: gpdb6-centos6-build params: IVYREPO_HOST: {{ivyrepo_host}} IVYREPO_REALM: {{ivyrepo_realm}} @@ -1046,7 +1046,7 @@ jobs: TASK_OS_VERSION: 6 - task: compile_gpdb file: gpdb_src/concourse/tasks/compile_gpdb.yml - image: centos6-build-gpdb6 + image: gpdb6-centos6-build params: CONFIGURE_FLAGS: {{configure_flags}} TARGET_OS: centos @@ -1070,10 +1070,10 @@ jobs: trigger: true - get: gpdb_src - get: gpaddon_src - - get: centos6-build-gpdb6 + - get: gpdb6-centos6-build - task: compile_gpdb_aix7_remote file: gpdb_src/concourse/tasks/compile_gpdb_remote.yml - image: centos6-build-gpdb6 + image: gpdb6-centos6-build params: REMOTE_HOST: {{remote_host_build}} REMOTE_PORT: {{remote_port_build}} @@ -1111,12 +1111,12 @@ jobs: passed: - compile_gpdb_centos6 resource: bin_gpdb_centos6 - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - put: aix_environments params: {acquire: true} - task: ic_gpdb_cl file: gpdb_src/concourse/tasks/ic_gpdb_remote.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: BLD_TARGETS: "clients loaders" REMOTE_HOST: {{remote_host_test}} @@ -1127,7 +1127,7 @@ jobs: do: - task: cleanup_aix file: gpdb_src/concourse/tasks/aix_remote_cleanup.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: REMOTE_HOST: {{remote_host_test}} REMOTE_PORT: {{remote_port_test}} @@ -1161,10 +1161,10 @@ jobs: passed: [compile_gpdb_binary_swap_centos6] resource: binary_swap_gpdb_centos6 trigger: [[ test_trigger ]] - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - task: ic_gpdb file: gpdb_src/concourse/tasks/ic_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=off' installcheck-world TEST_OS: centos @@ -1180,10 +1180,10 @@ jobs: resource: bin_gpdb_centos6 passed: [compile_gpdb_centos6] trigger: [[ test_trigger ]] - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - task: ic_gpdb file: gpdb_src/concourse/tasks/ic_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=on' installcheck-world TEST_OS: centos @@ -1202,10 +1202,10 @@ jobs: resource: bin_gpdb_centos6 passed: [compile_gpdb_centos6] trigger: [[ test_trigger ]] - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - task: ic_gpdb file: gpdb_src/concourse/tasks/ic_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=on' installcheck-world BLDWRAP_POSTGRES_CONF_ADDONS: optimizer_use_gpdb_allocators=on @@ -1221,10 +1221,10 @@ jobs: resource: bin_gpdb_centos6 passed: [compile_gpdb_centos6] trigger: [[ test_trigger ]] - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - task: ic_gpdb file: gpdb_src/concourse/tasks/ic_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: MAKE_TEST_COMMAND: -k PGOPTIONS='-c gp_interconnect_type=tcp -c optimizer=off' installcheck-world TEST_OS: centos @@ -1240,10 +1240,10 @@ jobs: resource: bin_gpdb_centos7 passed: [compile_gpdb_centos7] trigger: [[ test_trigger ]] - - get: centos7-test-gpdb6 + - get: gpdb6-centos7-test - task: ic_gpdb file: gpdb_src/concourse/tasks/ic_gpdb.yml - image: centos7-test-gpdb6 + image: gpdb6-centos7-test params: MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=on' installcheck-world TEST_OS: centos @@ -1258,10 +1258,10 @@ jobs: passed: [compile_gpdb_centos7] resource: bin_gpdb_centos7 trigger: [[ test_trigger ]] - - get: centos7-test-gpdb6 + - get: gpdb6-centos7-test - task: ic_gpdb file: gpdb_src/concourse/tasks/ic_gpdb.yml - image: centos7-test-gpdb6 + image: gpdb6-centos7-test params: MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=off' installcheck-world TEST_OS: centos @@ -1277,10 +1277,10 @@ jobs: passed: [compile_gpdb_centos7] resource: bin_gpdb_centos7 trigger: [[ test_trigger ]] - - get: centos7-test-gpdb6 + - get: gpdb6-centos7-test - task: ic_gpdb file: gpdb_src/concourse/tasks/ic_gpdb.yml - image: centos7-test-gpdb6 + image: gpdb6-centos7-test params: MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=off' installcheck-world TEST_OS: centos @@ -1514,10 +1514,10 @@ jobs: passed: [compile_gpdb_centos6] resource: bin_gpdb_centos6 trigger: [[ test_trigger ]] - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - task: ic_gpdb file: gpdb_src/concourse/tasks/ic_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: MAKE_TEST_COMMAND: -k PGOPTIONS='-c optimizer=off' BUILD_TYPE=((rc-build-type)) -C src/test/regress installcheck-icudp @@ -1797,10 +1797,10 @@ jobs: resource: bin_gpdb_centos6 passed: [gate_cli_start] trigger: [[ test_trigger ]] - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - task: gpcheck_as_gpadmin file: gpdb_src/concourse/tasks/behave_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: BEHAVE_TAGS: gpcheck_as_gpadmin GPCHECK_SETUP: true @@ -1811,7 +1811,7 @@ jobs: - aggregate: *gets_for_behave - task: [[ test_name ]] file: gpdb_src/concourse/tasks/behave_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: BEHAVE_TAGS: [[ test_name ]] @@ -1825,10 +1825,10 @@ jobs: resource: bin_gpdb_centos6 passed: [gate_cli_start] trigger: [[ test_trigger ]] - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - task: check_centos file: gpdb_src/concourse/tasks/gpMgmt_check_gpdb.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: TEST_OS: centos @@ -1983,10 +1983,10 @@ jobs: passed: [gate_ud_start] trigger: [[ test_trigger ]] resource: bin_gpdb_centos6 - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - task: regression_tests_gphdfs file: gpdb_src/concourse/tasks/regression_tests_gphdfs.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: TARGET_OS: centos TARGET_OS_VERSION: 6 @@ -2005,7 +2005,7 @@ jobs: trigger: [[ test_trigger ]] resource: bin_gpdb_centos6 - get: ccp_src - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - put: terraform params: <<: *ccp_default_params @@ -2020,7 +2020,7 @@ jobs: <<: *ccp_gen_cluster_default_params - task: regression_tests_gphdfs_mapr file: gpdb_src/concourse/tasks/regression_tests_gphdfs_mapr.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: TARGET_OS: centos TARGET_OS_VERSION: 6 @@ -2076,10 +2076,10 @@ jobs: passed: [gate_advanced_analytics_start] - get: bin_gpdb_centos7 passed: [gate_advanced_analytics_start] - - get: centos6-build-gpdb6 + - get: gpdb6-centos6-build - task: build_madlib_gppkg_from_source file: madlib_ci/concourse/tasks/madlib_build_gppkg_from_source.yml - image: centos6-build-gpdb6 + image: gpdb6-centos6-build params: TEST_OS: centos6 DB_TYPE: gpdb6 @@ -2100,13 +2100,13 @@ jobs: - get: bin_gpdb resource: bin_gpdb_centos6 passed: [madlib_build_gppkg] - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - get: madlib_gppkg passed: [madlib_build_gppkg] trigger: true - task: MADlib_Test_gppkg file: madlib_ci/concourse/tasks/madlib_test_gppkg.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: TEST_OS: centos ORCA: "off" @@ -2121,13 +2121,13 @@ jobs: - get: bin_gpdb resource: bin_gpdb_centos6 passed: [madlib_build_gppkg] - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - get: madlib_gppkg passed: [madlib_build_gppkg] trigger: true - task: MADlib_Test_gppkg file: madlib_ci/concourse/tasks/madlib_test_gppkg.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: TEST_OS: centos ORCA: "on" @@ -2144,13 +2144,13 @@ jobs: - get: bin_gpdb resource: bin_gpdb_centos7 passed: [madlib_build_gppkg] - - get: centos7-test-gpdb6 + - get: gpdb6-centos7-test - get: madlib_gppkg passed: [madlib_build_gppkg] trigger: true - task: MADlib_Test_gppkg file: madlib_ci/concourse/tasks/madlib_test_gppkg.yml - image: centos7-test-gpdb6 + image: gpdb6-centos7-test params: TEST_OS: centos ORCA: "off" @@ -2165,13 +2165,13 @@ jobs: - get: bin_gpdb resource: bin_gpdb_centos7 passed: [madlib_build_gppkg] - - get: centos7-test-gpdb6 + - get: gpdb6-centos7-test - get: madlib_gppkg passed: [madlib_build_gppkg] trigger: true - task: MADlib_Test_gppkg file: madlib_ci/concourse/tasks/madlib_test_gppkg.yml - image: centos7-test-gpdb6 + image: gpdb6-centos7-test params: TEST_OS: centos ORCA: "on" @@ -2323,18 +2323,18 @@ jobs: trigger: [[ test_trigger ]] - get: bin_gpdb_centos6 passed: [compile_gpdb_centos6] - - get: centos6-test-gpdb6 + - get: gpdb6-centos6-test - aggregate: - task: unit_tests_gpcloud file: gpdb_src/concourse/tasks/unit_tests_gpcloud.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test 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: centos6-test-gpdb6 + image: gpdb6-centos6-test params: gpcloud_access_key_id: {{gpcloud-access-key-id}} gpcloud_secret_access_key: {{gpcloud-secret-access-key}} @@ -2343,7 +2343,7 @@ jobs: input_mapping: bin_gpdb: bin_gpdb_centos6 file: gpdb_src/concourse/tasks/gpcheckcloud_tests_gpcloud.yml - image: centos6-test-gpdb6 + image: gpdb6-centos6-test params: gpcloud_access_key_id: {{gpcloud-access-key-id}} gpcloud_secret_access_key: {{gpcloud-secret-access-key}} diff --git a/concourse/tasks/gpcheckcloud_tests_gpcloud.yml b/concourse/tasks/gpcheckcloud_tests_gpcloud.yml index f5119942879a9b7ba57bfba90eb577448393a40c..e03e75313a94e9a724572860545d91318a2ae909 100644 --- a/concourse/tasks/gpcheckcloud_tests_gpcloud.yml +++ b/concourse/tasks/gpcheckcloud_tests_gpcloud.yml @@ -2,8 +2,8 @@ platform: linux image_resource: type: docker-image source: - repository: pivotaldata/centos6-test - tag: gpdb6-latest + repository: pivotaldata/gpdb6-centos6-test + tag: latest inputs: - name: gpdb_src - name: bin_gpdb diff --git a/concourse/tasks/regression_tests_gpcloud.yml b/concourse/tasks/regression_tests_gpcloud.yml index 32df3849fdec8dd4806304c85af015519620ae74..d8d0e300f97439d503e6a68965fd78eda1732bcb 100644 --- a/concourse/tasks/regression_tests_gpcloud.yml +++ b/concourse/tasks/regression_tests_gpcloud.yml @@ -2,8 +2,8 @@ platform: linux image_resource: type: docker-image source: - repository: pivotaldata/centos6-test - tag: gpdb6-latest + repository: pivotaldata/gpdb6-centos6-test + tag: latest inputs: - name: gpdb_src - name: bin_gpdb diff --git a/concourse/tasks/regression_tests_gphdfs.yml b/concourse/tasks/regression_tests_gphdfs.yml index 1930943a3aeea8c19d4e3866b68d9092c645cb07..53071d9d16aeb4ef9aba6d56b453ccb6fa095e36 100644 --- a/concourse/tasks/regression_tests_gphdfs.yml +++ b/concourse/tasks/regression_tests_gphdfs.yml @@ -2,8 +2,8 @@ platform: linux image_resource: type: docker-image source: - repository: pivotaldata/centos6-test - tag: gpdb6-latest + repository: pivotaldata/gpdb6-centos6-test + tag: latest username: password: inputs: diff --git a/concourse/tasks/regression_tests_gphdfs_mapr.yml b/concourse/tasks/regression_tests_gphdfs_mapr.yml index 3ee28a54203af44296ea3c8be6a17a0abd81ad8b..b9661bc52a60608f3bae35381bdf7eb1876e8ffe 100644 --- a/concourse/tasks/regression_tests_gphdfs_mapr.yml +++ b/concourse/tasks/regression_tests_gphdfs_mapr.yml @@ -2,8 +2,8 @@ platform: linux image_resource: type: docker-image source: - repository: pivotaldata/centos6-test - tag: gpdb6-latest + repository: pivotaldata/gpdb6-centos6-test + tag: latest username: password: