From c4c99bb065cc6508dd7fc6542f2d24463bc4d4c0 Mon Sep 17 00:00:00 2001 From: Amil Khanzada Date: Mon, 25 Mar 2019 18:34:34 -0700 Subject: [PATCH] Remove unused IVYREPO_ variables for CentOS 6/7 (#7248) * Remove unused IVYREPO_ variables for CentOS 6/7 Ivy is no longer used for CentOS 6/7. Authored-by: Amil Khanzada * Remove unused IVYREPO_ variables for Coverity Ivy is no longer used for CentOS 6/7 and will go away. The coverity pipeline is also puased at this point in time, but we'll clean this up now. Co-authored-by: Bradford D. Boyle Co-authored-by: Amil Khanzada --- concourse/pipelines/gpdb_master-generated.yml | 14 +------------- concourse/pipelines/pipeline_coverity.yml | 4 ---- concourse/pipelines/templates/gpdb-tpl.yml | 12 ------------ concourse/scripts/scan_with_coverity.bash | 2 -- concourse/tasks/scan_with_coverity.yml | 4 ---- 5 files changed, 1 insertion(+), 35 deletions(-) diff --git a/concourse/pipelines/gpdb_master-generated.yml b/concourse/pipelines/gpdb_master-generated.yml index 9fbd4b03f4..303d94a6b0 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-03-19 11:16:19.529007 +## Generated by gen_pipeline.py at: 2019-03-25 15:36:14.030271 ## Template file: gpdb-tpl.yml ## OS Types: ['centos6', 'centos7', 'sles', 'aix7', 'win', 'ubuntu16'] ## Test Sections: ['ICW', 'Replication', 'ResourceGroups', 'Interconnect', 'CLI', 'UD', 'AA', 'Extensions', 'Gpperfmon'] @@ -727,10 +727,6 @@ jobs: file: gpdb_src/concourse/tasks/sync_tools.yml image: gpdb6-centos6-build params: - IVYREPO_HOST: {{ivyrepo_host}} - IVYREPO_REALM: {{ivyrepo_realm}} - IVYREPO_USER: {{ivyrepo_user}} - IVYREPO_PASSWD: {{ivyrepo_passwd}} TARGET_OS: centos TARGET_OS_VERSION: 6 TASK_OS: centos @@ -768,10 +764,6 @@ jobs: file: gpdb_src/concourse/tasks/sync_tools.yml image: gpdb6-centos7-build params: - IVYREPO_HOST: {{ivyrepo_host}} - IVYREPO_REALM: {{ivyrepo_realm}} - IVYREPO_USER: {{ivyrepo_user}} - IVYREPO_PASSWD: {{ivyrepo_passwd}} TARGET_OS: centos TARGET_OS_VERSION: 7 TASK_OS: centos @@ -888,10 +880,6 @@ jobs: file: gpdb_src/concourse/tasks/sync_tools.yml image: gpdb6-centos6-build params: - IVYREPO_HOST: {{ivyrepo_host}} - IVYREPO_REALM: {{ivyrepo_realm}} - IVYREPO_USER: {{ivyrepo_user}} - IVYREPO_PASSWD: {{ivyrepo_passwd}} TARGET_OS: centos TARGET_OS_VERSION: 6 TASK_OS: centos diff --git a/concourse/pipelines/pipeline_coverity.yml b/concourse/pipelines/pipeline_coverity.yml index 4e29dac3f1..0c79512409 100644 --- a/concourse/pipelines/pipeline_coverity.yml +++ b/concourse/pipelines/pipeline_coverity.yml @@ -57,9 +57,5 @@ jobs: file: gpdb_src/concourse/tasks/scan_with_coverity.yml image: centos-coverity params: - IVYREPO_HOST: {{ivyrepo_host}} - IVYREPO_REALM: {{ivyrepo_realm}} - IVYREPO_USER: {{ivyrepo_user}} - IVYREPO_PASSWD: {{ivyrepo_passwd}} COVERITY_TOKEN: {{coverity_token}} COVERITY_EMAIL: {{coverity_email}} diff --git a/concourse/pipelines/templates/gpdb-tpl.yml b/concourse/pipelines/templates/gpdb-tpl.yml index f9bb4dcc7d..5aadc7f06f 100644 --- a/concourse/pipelines/templates/gpdb-tpl.yml +++ b/concourse/pipelines/templates/gpdb-tpl.yml @@ -873,10 +873,6 @@ jobs: file: gpdb_src/concourse/tasks/sync_tools.yml image: gpdb6-centos6-build params: - IVYREPO_HOST: {{ivyrepo_host}} - IVYREPO_REALM: {{ivyrepo_realm}} - IVYREPO_USER: {{ivyrepo_user}} - IVYREPO_PASSWD: {{ivyrepo_passwd}} TARGET_OS: centos TARGET_OS_VERSION: 6 TASK_OS: centos @@ -916,10 +912,6 @@ jobs: file: gpdb_src/concourse/tasks/sync_tools.yml image: gpdb6-centos7-build params: - IVYREPO_HOST: {{ivyrepo_host}} - IVYREPO_REALM: {{ivyrepo_realm}} - IVYREPO_USER: {{ivyrepo_user}} - IVYREPO_PASSWD: {{ivyrepo_passwd}} TARGET_OS: centos TARGET_OS_VERSION: 7 TASK_OS: centos @@ -1044,10 +1036,6 @@ jobs: file: gpdb_src/concourse/tasks/sync_tools.yml image: gpdb6-centos6-build params: - IVYREPO_HOST: {{ivyrepo_host}} - IVYREPO_REALM: {{ivyrepo_realm}} - IVYREPO_USER: {{ivyrepo_user}} - IVYREPO_PASSWD: {{ivyrepo_passwd}} TARGET_OS: centos TARGET_OS_VERSION: 6 TASK_OS: centos diff --git a/concourse/scripts/scan_with_coverity.bash b/concourse/scripts/scan_with_coverity.bash index ec486d3b15..f5f9f8cf34 100755 --- a/concourse/scripts/scan_with_coverity.bash +++ b/concourse/scripts/scan_with_coverity.bash @@ -31,8 +31,6 @@ function generate_build_number() { function make_sync_tools() { pushd gpdb_src/gpAux - # Requires these variables in the env: - # IVYREPO_HOST IVYREPO_REALM IVYREPO_USER IVYREPO_PASSWD make sync_tools # We have compiled LLVM with native zlib on CentOS6 and not from # the zlib downloaded from artifacts. Therefore, remove the zlib diff --git a/concourse/tasks/scan_with_coverity.yml b/concourse/tasks/scan_with_coverity.yml index f9f49a86a2..b3b44be1e9 100644 --- a/concourse/tasks/scan_with_coverity.yml +++ b/concourse/tasks/scan_with_coverity.yml @@ -13,9 +13,5 @@ run: path: gpdb_src/concourse/scripts/scan_with_coverity.bash params: OUTPUT_ARTIFACT_DIR: gpdb_coverity_artifacts - IVYREPO_HOST: - IVYREPO_PASSWD: - IVYREPO_REALM: - IVYREPO_USER: COVERITY_TOKEN: COVERITY_EMAIL: -- GitLab