提交 c4c99bb0 编写于 作者: A Amil Khanzada 提交者: Tingfang Bao

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: NAmil Khanzada <akhanzada@pivotal.io>

* 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: NBradford D. Boyle <bboyle@pivotal.io>
Co-authored-by: NAmil Khanzada <akhanzada@pivotal.io>
上级 5f4a5fda
...@@ -12,7 +12,7 @@ ...@@ -12,7 +12,7 @@
## file (example: templates/gpdb-tpl.yml) and regenerate the pipeline ## file (example: templates/gpdb-tpl.yml) and regenerate the pipeline
## using appropriate tool (example: gen_pipeline.py -t prod). ## 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 ## Template file: gpdb-tpl.yml
## OS Types: ['centos6', 'centos7', 'sles', 'aix7', 'win', 'ubuntu16'] ## OS Types: ['centos6', 'centos7', 'sles', 'aix7', 'win', 'ubuntu16']
## Test Sections: ['ICW', 'Replication', 'ResourceGroups', 'Interconnect', 'CLI', 'UD', 'AA', 'Extensions', 'Gpperfmon'] ## Test Sections: ['ICW', 'Replication', 'ResourceGroups', 'Interconnect', 'CLI', 'UD', 'AA', 'Extensions', 'Gpperfmon']
...@@ -727,10 +727,6 @@ jobs: ...@@ -727,10 +727,6 @@ jobs:
file: gpdb_src/concourse/tasks/sync_tools.yml file: gpdb_src/concourse/tasks/sync_tools.yml
image: gpdb6-centos6-build image: gpdb6-centos6-build
params: params:
IVYREPO_HOST: {{ivyrepo_host}}
IVYREPO_REALM: {{ivyrepo_realm}}
IVYREPO_USER: {{ivyrepo_user}}
IVYREPO_PASSWD: {{ivyrepo_passwd}}
TARGET_OS: centos TARGET_OS: centos
TARGET_OS_VERSION: 6 TARGET_OS_VERSION: 6
TASK_OS: centos TASK_OS: centos
...@@ -768,10 +764,6 @@ jobs: ...@@ -768,10 +764,6 @@ jobs:
file: gpdb_src/concourse/tasks/sync_tools.yml file: gpdb_src/concourse/tasks/sync_tools.yml
image: gpdb6-centos7-build image: gpdb6-centos7-build
params: params:
IVYREPO_HOST: {{ivyrepo_host}}
IVYREPO_REALM: {{ivyrepo_realm}}
IVYREPO_USER: {{ivyrepo_user}}
IVYREPO_PASSWD: {{ivyrepo_passwd}}
TARGET_OS: centos TARGET_OS: centos
TARGET_OS_VERSION: 7 TARGET_OS_VERSION: 7
TASK_OS: centos TASK_OS: centos
...@@ -888,10 +880,6 @@ jobs: ...@@ -888,10 +880,6 @@ jobs:
file: gpdb_src/concourse/tasks/sync_tools.yml file: gpdb_src/concourse/tasks/sync_tools.yml
image: gpdb6-centos6-build image: gpdb6-centos6-build
params: params:
IVYREPO_HOST: {{ivyrepo_host}}
IVYREPO_REALM: {{ivyrepo_realm}}
IVYREPO_USER: {{ivyrepo_user}}
IVYREPO_PASSWD: {{ivyrepo_passwd}}
TARGET_OS: centos TARGET_OS: centos
TARGET_OS_VERSION: 6 TARGET_OS_VERSION: 6
TASK_OS: centos TASK_OS: centos
......
...@@ -57,9 +57,5 @@ jobs: ...@@ -57,9 +57,5 @@ jobs:
file: gpdb_src/concourse/tasks/scan_with_coverity.yml file: gpdb_src/concourse/tasks/scan_with_coverity.yml
image: centos-coverity image: centos-coverity
params: params:
IVYREPO_HOST: {{ivyrepo_host}}
IVYREPO_REALM: {{ivyrepo_realm}}
IVYREPO_USER: {{ivyrepo_user}}
IVYREPO_PASSWD: {{ivyrepo_passwd}}
COVERITY_TOKEN: {{coverity_token}} COVERITY_TOKEN: {{coverity_token}}
COVERITY_EMAIL: {{coverity_email}} COVERITY_EMAIL: {{coverity_email}}
...@@ -873,10 +873,6 @@ jobs: ...@@ -873,10 +873,6 @@ jobs:
file: gpdb_src/concourse/tasks/sync_tools.yml file: gpdb_src/concourse/tasks/sync_tools.yml
image: gpdb6-centos6-build image: gpdb6-centos6-build
params: params:
IVYREPO_HOST: {{ivyrepo_host}}
IVYREPO_REALM: {{ivyrepo_realm}}
IVYREPO_USER: {{ivyrepo_user}}
IVYREPO_PASSWD: {{ivyrepo_passwd}}
TARGET_OS: centos TARGET_OS: centos
TARGET_OS_VERSION: 6 TARGET_OS_VERSION: 6
TASK_OS: centos TASK_OS: centos
...@@ -916,10 +912,6 @@ jobs: ...@@ -916,10 +912,6 @@ jobs:
file: gpdb_src/concourse/tasks/sync_tools.yml file: gpdb_src/concourse/tasks/sync_tools.yml
image: gpdb6-centos7-build image: gpdb6-centos7-build
params: params:
IVYREPO_HOST: {{ivyrepo_host}}
IVYREPO_REALM: {{ivyrepo_realm}}
IVYREPO_USER: {{ivyrepo_user}}
IVYREPO_PASSWD: {{ivyrepo_passwd}}
TARGET_OS: centos TARGET_OS: centos
TARGET_OS_VERSION: 7 TARGET_OS_VERSION: 7
TASK_OS: centos TASK_OS: centos
...@@ -1044,10 +1036,6 @@ jobs: ...@@ -1044,10 +1036,6 @@ jobs:
file: gpdb_src/concourse/tasks/sync_tools.yml file: gpdb_src/concourse/tasks/sync_tools.yml
image: gpdb6-centos6-build image: gpdb6-centos6-build
params: params:
IVYREPO_HOST: {{ivyrepo_host}}
IVYREPO_REALM: {{ivyrepo_realm}}
IVYREPO_USER: {{ivyrepo_user}}
IVYREPO_PASSWD: {{ivyrepo_passwd}}
TARGET_OS: centos TARGET_OS: centos
TARGET_OS_VERSION: 6 TARGET_OS_VERSION: 6
TASK_OS: centos TASK_OS: centos
......
...@@ -31,8 +31,6 @@ function generate_build_number() { ...@@ -31,8 +31,6 @@ function generate_build_number() {
function make_sync_tools() { function make_sync_tools() {
pushd gpdb_src/gpAux pushd gpdb_src/gpAux
# Requires these variables in the env:
# IVYREPO_HOST IVYREPO_REALM IVYREPO_USER IVYREPO_PASSWD
make sync_tools make sync_tools
# We have compiled LLVM with native zlib on CentOS6 and not from # We have compiled LLVM with native zlib on CentOS6 and not from
# the zlib downloaded from artifacts. Therefore, remove the zlib # the zlib downloaded from artifacts. Therefore, remove the zlib
......
...@@ -13,9 +13,5 @@ run: ...@@ -13,9 +13,5 @@ run:
path: gpdb_src/concourse/scripts/scan_with_coverity.bash path: gpdb_src/concourse/scripts/scan_with_coverity.bash
params: params:
OUTPUT_ARTIFACT_DIR: gpdb_coverity_artifacts OUTPUT_ARTIFACT_DIR: gpdb_coverity_artifacts
IVYREPO_HOST:
IVYREPO_PASSWD:
IVYREPO_REALM:
IVYREPO_USER:
COVERITY_TOKEN: COVERITY_TOKEN:
COVERITY_EMAIL: COVERITY_EMAIL:
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册