From a050e4d7fd21aaa861b690e96760a6404184e064 Mon Sep 17 00:00:00 2001 From: Peifeng Qiu Date: Wed, 17 Apr 2019 14:55:08 +0800 Subject: [PATCH] Remove aix jobs from pipeline Currently there are infrastructure issues affecting the maintainability of these jobs. Until we can address these underlying issues, all CI jobs related to AIX are being removed. Co-authored-by: Peifeng Qiu Co-authored-by: Bradford D. Boyle Co-authored-by: Kris Macoskey --- concourse/pipelines/gen_pipeline.py | 6 +- concourse/pipelines/gpdb_master-generated.yml | 122 +--------------- concourse/pipelines/templates/gpdb-tpl.yml | 136 +----------------- 3 files changed, 5 insertions(+), 259 deletions(-) diff --git a/concourse/pipelines/gen_pipeline.py b/concourse/pipelines/gen_pipeline.py index 2d92cf81e4..96c1528994 100755 --- a/concourse/pipelines/gen_pipeline.py +++ b/concourse/pipelines/gen_pipeline.py @@ -65,10 +65,8 @@ JOBS_THAT_SHOULD_NOT_BLOCK_RELEASE = ( 'compile_gpdb_binary_swap_centos6', 'icw_gporca_centos6_gpos_memory', 'walrep_2', - 'client_loader_remote_test_aix', 'compile_gpdb_sles11', 'compile_gpdb_ubuntu16', - 'compile_gpdb_aix7_remote', 'icw_gporca_sles11', 'icw_gporca_sles12', 'icw_planner_sles12', @@ -258,7 +256,7 @@ def main(): action='store', dest='os_types', default=['centos6'], - choices=['centos6', 'centos7', 'sles', 'aix7', 'win', 'ubuntu16'], + choices=['centos6', 'centos7', 'sles', 'win', 'ubuntu16'], nargs='+', help='List of OS values to support' ) @@ -313,7 +311,7 @@ def main(): args = parser.parse_args() if args.pipeline_type == 'prod': - args.os_types = ['centos6', 'centos7', 'sles', 'aix7', 'win', 'ubuntu16'] + args.os_types = ['centos6', 'centos7', 'sles', 'win', 'ubuntu16'] args.test_sections = [ 'ICW', 'Replication', diff --git a/concourse/pipelines/gpdb_master-generated.yml b/concourse/pipelines/gpdb_master-generated.yml index 2f8e5aba15..ebb1155c38 100644 --- a/concourse/pipelines/gpdb_master-generated.yml +++ b/concourse/pipelines/gpdb_master-generated.yml @@ -12,9 +12,9 @@ ## 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-04-18 17:20:05.458317 +## Generated by gen_pipeline.py at: 2019-04-19 10:07:01.309600 ## Template file: gpdb-tpl.yml -## OS Types: ['centos6', 'centos7', 'sles', 'aix7', 'win', 'ubuntu16'] +## OS Types: ['centos6', 'centos7', 'sles', 'win', 'ubuntu16'] ## Test Sections: ['ICW', 'Replication', 'ResourceGroups', 'Interconnect', 'CLI', 'UD', 'Extensions', 'Gpperfmon'] ## ====================================================================== @@ -37,8 +37,6 @@ groups: - compile_gpdb_centos7 - compile_gpdb_sles11 - compile_gpdb_ubuntu16 - - compile_gpdb_aix7_remote - - client_loader_remote_test_aix ## -------------------------------------------------------------------- - icw_gporca_centos6 - icw_gporca_centos6_gpos_memory @@ -104,14 +102,6 @@ groups: - compile_gpdb_centos7 - compile_gpdb_sles11 - compile_gpdb_ubuntu16 - - compile_gpdb_aix7_remote - -## ====================================================================== - -- name: ClientsLoaders - jobs: - - compile_gpdb_aix7_remote - - client_loader_remote_test_aix ## ====================================================================== @@ -264,14 +254,6 @@ resources: json_key: ((concourse-gcs-resources-service-account-key)) versioned_file: ((pipeline-name))/icw_gporca_centos6_dump/dump.sql.xz -- name: aix_environments - type: pool - source: - uri: {{concourse-resource-pools-git-remote}} - branch: master - pool: client_loader_remote_aix - private_key: {{concourse-resource-pools-git-key}} - - name: gpdb_src type: git source: @@ -473,20 +455,6 @@ resources: json_key: ((concourse-gcs-resources-service-account-key)) versioned_file: ((pipeline-name))/bin_gpdb_sles11/bin_gpdb.tar.gz -- name: installer_aix7_gpdb_clients - type: gcs - source: - bucket: ((gcs-bucket-intermediates)) - json_key: ((concourse-gcs-resources-service-account-key)) - regexp: ((pipeline-name))/installer_aix7_gpdb_clients/greenplum-clients-(.*)-aix7_ppc_64.zip - -- name: installer_aix7_gpdb_loaders - type: gcs - source: - bucket: ((gcs-bucket-intermediates)) - json_key: ((concourse-gcs-resources-service-account-key)) - regexp: ((pipeline-name))/installer_aix7_gpdb_loaders/greenplum-loaders-(.*)-aix7_ppc_64.zip - - name: deb_package_ubuntu16 type: gcs source: @@ -494,14 +462,6 @@ resources: json_key: ((concourse-gcs-resources-service-account-key)) versioned_file: ((pipeline-name))/deb_package_ubuntu16/greenplum-db.deb -- name: nightly-trigger - type: time - source: - location: America/Los_Angeles - days: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday] - start: 6:00 AM - stop: 7:00 AM - - name: reduced-frequency-trigger type: time @@ -827,82 +787,6 @@ jobs: params: file: gpdb_artifacts/bin_gpdb.tar.gz -- name: compile_gpdb_aix7_remote - serial: true - plan: - # Compile gpdb on a remote AIX machine, triggered by concourse. - # We need to serialize this job to avoid overwhelming workload - # on remote machine. - - aggregate: - - get: nightly-trigger - trigger: true - - get: gpdb_src - - get: gpdb6-centos6-build - - task: compile_gpdb_aix7_remote - file: gpdb_src/concourse/tasks/compile_gpdb_remote.yml - image: gpdb6-centos6-build - params: - REMOTE_HOST: {{remote_host_build}} - REMOTE_PORT: {{remote_port_build}} - REMOTE_USER: {{remote_user_build}} - REMOTE_KEY: {{remote_key_build}} - IVYREPO_HOST: {{ivyrepo_host}} - IVYREPO_REALM: {{ivyrepo_realm}} - IVYREPO_USER: {{ivyrepo_user}} - IVYREPO_PASSWD: {{ivyrepo_passwd}} - BLD_TARGETS: "clients loaders" - - aggregate: - - put: installer_aix7_gpdb_clients - params: - file: gpdb_artifacts/greenplum-clients-*-aix7_ppc_64.zip - - put: installer_aix7_gpdb_loaders - params: - file: gpdb_artifacts/greenplum-loaders-*-aix7_ppc_64.zip - -- name: client_loader_remote_test_aix - serial: true - plan: - - aggregate: - - get: gpdb_src - passed: - - compile_gpdb_aix7_remote - - compile_gpdb_centos6 - - get: installer_aix7_gpdb_clients - passed: - - compile_gpdb_aix7_remote - - get: installer_aix7_gpdb_loaders - passed: - - compile_gpdb_aix7_remote - trigger: true - - get: bin_gpdb - passed: - - compile_gpdb_centos6 - resource: bin_gpdb_centos6 - - get: gpdb6-centos6-test - - put: aix_environments - params: {acquire: true} - - task: ic_gpdb_cl - file: gpdb_src/concourse/tasks/ic_gpdb_remote.yml - image: gpdb6-centos6-test - params: - BLD_TARGETS: "clients loaders" - REMOTE_HOST: {{remote_host_test}} - REMOTE_PORT: {{remote_port_test}} - REMOTE_USER: {{remote_user_test}} - REMOTE_KEY: {{remote_key_test}} - ensure: - do: - - task: cleanup_aix - file: gpdb_src/concourse/tasks/aix_remote_cleanup.yml - image: gpdb6-centos6-test - params: - REMOTE_HOST: {{remote_host_test}} - REMOTE_PORT: {{remote_port_test}} - REMOTE_USER: {{remote_user_test}} - REMOTE_KEY: {{remote_key_test}} - - put: aix_environments - params: {release: aix_environments} - ## ====================================================================== ## ___ ______ __ @@ -2035,7 +1919,6 @@ jobs: - compile_gpdb_centos7 ## - compile_gpdb_sles11 ## - compile_gpdb_ubuntu16 - ## - compile_gpdb_aix7_remote - icw_planner_centos6 - icw_gporca_centos6 - icw_gporca_centos7 @@ -2084,7 +1967,6 @@ jobs: - icw_gporca_centos6 - icw_planner_ictcp_centos6 - icw_extensions_gpcloud_centos6 - ## - client_loader_remote_test_aix - resource_group_centos6 - gpmovemirrors - gpcheck diff --git a/concourse/pipelines/templates/gpdb-tpl.yml b/concourse/pipelines/templates/gpdb-tpl.yml index 552a130275..747f2baac0 100644 --- a/concourse/pipelines/templates/gpdb-tpl.yml +++ b/concourse/pipelines/templates/gpdb-tpl.yml @@ -61,12 +61,6 @@ groups: {% if "ubuntu16" in os_types %} - compile_gpdb_ubuntu16 {% endif %} -{% if "aix7" in os_types %} - - compile_gpdb_aix7_remote -{% endif %} -{% if "aix7" in os_types %} - - client_loader_remote_test_aix -{% endif %} {% if "ICW" in test_sections %} ## -------------------------------------------------------------------- {% if "centos6" in os_types %} @@ -184,18 +178,6 @@ groups: {% if "ubuntu16" in os_types %} - compile_gpdb_ubuntu16 {% endif %} -{% if "aix7" in os_types %} - - compile_gpdb_aix7_remote -{% endif %} - -## ====================================================================== - -- name: ClientsLoaders - jobs: -{% if "aix7" in os_types %} - - compile_gpdb_aix7_remote - - client_loader_remote_test_aix -{% endif %} {% if "ICW" in test_sections %} ## ====================================================================== @@ -402,16 +384,6 @@ resources: json_key: ((concourse-gcs-resources-service-account-key)) versioned_file: ((pipeline-name))/icw_gporca_centos6_dump/dump.sql.xz -{% endif %} -{% if "aix7" in os_types %} -- name: aix_environments - type: pool - source: - uri: {{concourse-resource-pools-git-remote}} - branch: master - pool: client_loader_remote_aix - private_key: {{concourse-resource-pools-git-key}} - {% endif %} - name: gpdb_src type: git @@ -506,7 +478,7 @@ resources: versioned_file: centos7/python-2.7.12.tar.gz {% endif %} -{% if "centos6" in os_types or "sles" in os_types or "aix7" in os_types %} +{% if "centos6" in os_types or "sles" in os_types %} - name: gpdb6-centos6-build type: docker-image source: @@ -643,22 +615,6 @@ resources: json_key: ((concourse-gcs-resources-service-account-key)) versioned_file: ((pipeline-name))/bin_gpdb_sles11/bin_gpdb.tar.gz -{% endif %} -{% if "aix7" in os_types %} -- name: installer_aix7_gpdb_clients - type: gcs - source: - bucket: ((gcs-bucket-intermediates)) - json_key: ((concourse-gcs-resources-service-account-key)) - regexp: ((pipeline-name))/installer_aix7_gpdb_clients/greenplum-clients-(.*)-aix7_ppc_64.zip - -- name: installer_aix7_gpdb_loaders - type: gcs - source: - bucket: ((gcs-bucket-intermediates)) - json_key: ((concourse-gcs-resources-service-account-key)) - regexp: ((pipeline-name))/installer_aix7_gpdb_loaders/greenplum-loaders-(.*)-aix7_ppc_64.zip - {% endif %} {% if "ubuntu16" in os_types %} - name: deb_package_ubuntu16 @@ -668,16 +624,6 @@ resources: json_key: ((concourse-gcs-resources-service-account-key)) versioned_file: ((pipeline-name))/deb_package_ubuntu16/greenplum-db.deb -{% endif %} -{% if "aix7" in os_types %} -- name: nightly-trigger - type: time - source: - location: America/Los_Angeles - days: [Sunday, Monday, Tuesday, Wednesday, Thursday, Friday] - start: 6:00 AM - stop: 7:00 AM - {% endif %} {% if "AA" in test_sections %} - name: madlib_src @@ -1072,84 +1018,6 @@ jobs: params: file: gpdb_artifacts/bin_gpdb.tar.gz -{% endif %} -{% if "aix7" in os_types %} -- name: compile_gpdb_aix7_remote - serial: true - plan: - # Compile gpdb on a remote AIX machine, triggered by concourse. - # We need to serialize this job to avoid overwhelming workload - # on remote machine. - - aggregate: - - get: nightly-trigger - trigger: true - - get: gpdb_src - - get: gpdb6-centos6-build - - task: compile_gpdb_aix7_remote - file: gpdb_src/concourse/tasks/compile_gpdb_remote.yml - image: gpdb6-centos6-build - params: - REMOTE_HOST: {{remote_host_build}} - REMOTE_PORT: {{remote_port_build}} - REMOTE_USER: {{remote_user_build}} - REMOTE_KEY: {{remote_key_build}} - IVYREPO_HOST: {{ivyrepo_host}} - IVYREPO_REALM: {{ivyrepo_realm}} - IVYREPO_USER: {{ivyrepo_user}} - IVYREPO_PASSWD: {{ivyrepo_passwd}} - BLD_TARGETS: "clients loaders" - - aggregate: - - put: installer_aix7_gpdb_clients - params: - file: gpdb_artifacts/greenplum-clients-*-aix7_ppc_64.zip - - put: installer_aix7_gpdb_loaders - params: - file: gpdb_artifacts/greenplum-loaders-*-aix7_ppc_64.zip - -- name: client_loader_remote_test_aix - serial: true - plan: - - aggregate: - - get: gpdb_src - passed: - - compile_gpdb_aix7_remote - - compile_gpdb_centos6 - - get: installer_aix7_gpdb_clients - passed: - - compile_gpdb_aix7_remote - - get: installer_aix7_gpdb_loaders - passed: - - compile_gpdb_aix7_remote - trigger: true - - get: bin_gpdb - passed: - - compile_gpdb_centos6 - resource: bin_gpdb_centos6 - - get: gpdb6-centos6-test - - put: aix_environments - params: {acquire: true} - - task: ic_gpdb_cl - file: gpdb_src/concourse/tasks/ic_gpdb_remote.yml - image: gpdb6-centos6-test - params: - BLD_TARGETS: "clients loaders" - REMOTE_HOST: {{remote_host_test}} - REMOTE_PORT: {{remote_port_test}} - REMOTE_USER: {{remote_user_test}} - REMOTE_KEY: {{remote_key_test}} - ensure: - do: - - task: cleanup_aix - file: gpdb_src/concourse/tasks/aix_remote_cleanup.yml - image: gpdb6-centos6-test - params: - REMOTE_HOST: {{remote_host_test}} - REMOTE_PORT: {{remote_port_test}} - REMOTE_USER: {{remote_user_test}} - REMOTE_KEY: {{remote_key_test}} - - put: aix_environments - params: {release: aix_environments} - {% endif %} {% if "ICW" in test_sections %} @@ -2159,7 +2027,6 @@ jobs: - compile_gpdb_centos7 ## - compile_gpdb_sles11 ## - compile_gpdb_ubuntu16 - ## - compile_gpdb_aix7_remote - icw_planner_centos6 - icw_gporca_centos6 - icw_gporca_centos7 @@ -2199,7 +2066,6 @@ jobs: - icw_gporca_centos6 - icw_planner_ictcp_centos6 - icw_extensions_gpcloud_centos6 - ## - client_loader_remote_test_aix - resource_group_centos6 {% for test in CLI_BEHAVE_TESTS %} - [[ test.name ]] -- GitLab