Skip to content

Commit

Permalink
Merge pull request #336 from arenadata/5.29.6-sync
Browse files Browse the repository at this point in the history 
ADBDEV-2720 5.29.6 sync
  • Loading branch information
@deart2k
deart2k authored May 26, 2022
2 parents d1bf867 + 4f038df commit e975ff7
Show file tree
Hide file tree
Showing 15 changed files with 180 additions and 216 deletions.
130 changes: 69 additions & 61 deletions concourse/pipelines/5X_STABLE-generated.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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: 2021-07-26 14:46:21.521028
## Generated by gen_pipeline.py at: 2022-03-24 18:29:35.954037
## Template file: gpdb-tpl.yml
## OS Types: ['centos6', 'centos7', 'sles', 'aix7', 'win']
## Test Sections: ['ICW', 'CS', 'MPP', 'MM', 'DPM', 'UD', 'FileRep', 'AA']
Expand Down Expand Up @@ -445,6 +445,43 @@ resources:
secret_access_key: {{bucket-secret-access-key}}
versioned_file: {{bin_gpdb_centos_versioned_file}}

- name: gpdb_artifacts_centos6
source:
bucket: pivotal-gpdb-concourse-resources-prod
json_key: ((concourse-gcs-resources-service-account-key))
regexp: gp-internal-artifacts/centos6/gpdb5-artifacts-centos6-(1\.0\.0).tar.gz
type: gcs
- name: gpdb_artifacts_centos7
source:
bucket: pivotal-gpdb-concourse-resources-prod
json_key: ((concourse-gcs-resources-service-account-key))
regexp: gp-internal-artifacts/centos7/gpdb5-artifacts-centos7-(1\.0\.0).tar.gz
type: gcs
- name: gpdb_artifacts_sles11
source:
bucket: pivotal-gpdb-concourse-resources-prod
json_key: ((concourse-gcs-resources-service-account-key))
regexp: gp-internal-artifacts/sles11/gpdb5-artifacts-sles11-(1\.0\.0).tar.gz
type: gcs
- name: gpdb_artifacts_windows
source:
bucket: pivotal-gpdb-concourse-resources-prod
json_key: ((concourse-gcs-resources-service-account-key))
regexp: gp-internal-artifacts/win32/gpdb5-artifacts-win32-(1\.0\.0).tar.gz
type: gcs
- name: postgis_artifacts_centos6
source:
bucket: pivotal-gpdb-concourse-resources-prod
json_key: ((concourse-gcs-resources-service-account-key))
regexp: gp-internal-artifacts/centos6/postgis-artifacts-centos6-(1\.0\.0).tar.gz
type: gcs
- name: postgis_artifacts_centos7
source:
bucket: pivotal-gpdb-concourse-resources-prod
json_key: ((concourse-gcs-resources-service-account-key))
regexp: gp-internal-artifacts/centos7/postgis-artifacts-centos7-(1\.0\.0).tar.gz
type: gcs

- name: bin_gpdb_centos6_icw_green
type: s3
source:
Expand Down Expand Up @@ -1008,18 +1045,12 @@ jobs:
passed: [gate_compile_start]
- get: centos-gpdb-dev-6
passed: [gate_compile_start]
- get: gpdb_artifacts_centos6
- task: sync_tools
file: gpdb_src/concourse/tasks/sync_tools.yml
image: centos-gpdb-dev-6
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
TASK_OS_VERSION: 6
input_mapping:
gpdb_artifacts: gpdb_artifacts_centos6
- task: compile_gpdb
file: gpdb_src/concourse/tasks/compile_gpdb.yml
image: centos-gpdb-dev-6
Expand Down Expand Up @@ -1051,18 +1082,12 @@ jobs:
passed: [gate_compile_start]
- get: centos-gpdb-dev-7
passed: [gate_compile_start]
- get: gpdb_artifacts_centos7
- task: sync_tools
file: gpdb_src/concourse/tasks/sync_tools.yml
image: centos-gpdb-dev-7
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
TASK_OS_VERSION: 7
input_mapping:
gpdb_artifacts: gpdb_artifacts_centos7
- task: compile_gpdb
image: centos-gpdb-dev-7
file: gpdb_src/concourse/tasks/compile_gpdb.yml
Expand Down Expand Up @@ -1095,18 +1120,12 @@ jobs:
- get: centos-gpdb-dev-7
passed: [gate_compile_start]
- get: gpdb5-sles11-build-test
- get: gpdb_artifacts_sles11
- task: sync_tools
file: gpdb_src/concourse/tasks/sync_tools.yml
image: centos-gpdb-dev-7
params:
IVYREPO_HOST: {{ivyrepo_host}}
IVYREPO_REALM: {{ivyrepo_realm}}
IVYREPO_USER: {{ivyrepo_user}}
IVYREPO_PASSWD: {{ivyrepo_passwd}}
TARGET_OS: sles
TARGET_OS_VERSION:
TASK_OS: centos
TASK_OS_VERSION: 7
input_mapping:
gpdb_artifacts: gpdb_artifacts_sles11
- task: compile_gpdb
file: gpdb_src/concourse/tasks/compile_gpdb_sles11.yml
image: gpdb5-sles11-build-test
Expand Down Expand Up @@ -1178,18 +1197,13 @@ jobs:
- get: centos-gpdb-dev-7
tags: ["wix"]
passed: [gate_compile_start]
- get: gpdb_artifacts_windows
tags: ["wix"]
- task: sync_tools
file: gpdb_src/concourse/tasks/sync_tools.yml
image: centos-gpdb-dev-7
params:
IVYREPO_HOST: {{ivyrepo_host}}
IVYREPO_REALM: {{ivyrepo_realm}}
IVYREPO_USER: {{ivyrepo_user}}
IVYREPO_PASSWD: {{ivyrepo_passwd}}
TARGET_OS: win32
TARGET_OS_VERSION:
TASK_OS: centos
TASK_OS_VERSION: 7
input_mapping:
gpdb_artifacts: gpdb_artifacts_windows
- task: compile_gpdb
tags: ["wix"]
image: centos-mingw
Expand Down Expand Up @@ -3393,16 +3407,15 @@ jobs:
- gate_advanced_analytics_start
- get: centos-gpdb-dev-6
- get: gcc_4.4.2_snowflake
- get: postgis_artifacts_centos6
- in_parallel:
- task: postgis_gpdb_build
file: madlib_ci/concourse/tasks/build_postgis.yml
image: centos-gpdb-dev-6
input_mapping:
postgis_artifacts: postgis_artifacts_centos6
params:
TEST_OS: centos6
IVYREPO_HOST: {{ivyrepo_host}}
IVYREPO_REALM: {{ivyrepo_realm}}
IVYREPO_USER: {{ivyrepo_user}}
IVYREPO_PASSWD: {{ivyrepo_passwd}}
- in_parallel:
- put: postgis_gppkg_centos6
params:
Expand All @@ -3422,16 +3435,15 @@ jobs:
- gate_advanced_analytics_start
- get: centos-gpdb-dev-7
- get: gcc_4.4.2_snowflake
- get: postgis_artifacts_centos7
- in_parallel:
- task: postgis_gpdb_build
file: madlib_ci/concourse/tasks/build_postgis.yml
image: centos-gpdb-dev-7
input_mapping:
postgis_artifacts: postgis_artifacts_centos7
params:
TEST_OS: centos7
IVYREPO_HOST: {{ivyrepo_host}}
IVYREPO_REALM: {{ivyrepo_realm}}
IVYREPO_USER: {{ivyrepo_user}}
IVYREPO_PASSWD: {{ivyrepo_passwd}}
- in_parallel:
- put: postgis_gppkg_centos7
params:
Expand Down Expand Up @@ -3482,16 +3494,15 @@ jobs:
passed:
- postgis_build_centos6
- get: gcc_4.4.2_snowflake
- get: postgis_artifacts_centos6
- task: test_postgis
file: madlib_ci/concourse/tasks/test_postgis.yml
image: centos-gpdb-dev-6
input_mapping:
postgis_artifacts: postgis_artifacts_centos6
params:
PGOPTIONS: '-c optimizer=off'
TEST_OS: centos6
IVYREPO_HOST: {{ivyrepo_host}}
IVYREPO_REALM: {{ivyrepo_realm}}
IVYREPO_USER: {{ivyrepo_user}}
IVYREPO_PASSWD: {{ivyrepo_passwd}}

- name: MADlib_Test_Orca_centos6
plan:
Expand Down Expand Up @@ -3538,16 +3549,15 @@ jobs:
passed:
- postgis_build_centos6
- get: gcc_4.4.2_snowflake
- get: postgis_artifacts_centos6
- task: test_postgis
file: madlib_ci/concourse/tasks/test_postgis.yml
image: centos-gpdb-dev-6
input_mapping:
postgis_artifacts: postgis_artifacts_centos6
params:
PGOPTIONS: '-c optimizer=on'
TEST_OS: centos6
IVYREPO_HOST: {{ivyrepo_host}}
IVYREPO_REALM: {{ivyrepo_realm}}
IVYREPO_USER: {{ivyrepo_user}}
IVYREPO_PASSWD: {{ivyrepo_passwd}}

- name: MADlib_Test_Planner_centos7
plan:
Expand Down Expand Up @@ -3594,16 +3604,15 @@ jobs:
passed:
- postgis_build_centos7
- get: gcc_4.4.2_snowflake
- get: postgis_artifacts_centos7
- task: test_postgis
file: madlib_ci/concourse/tasks/test_postgis.yml
image: centos-gpdb-dev-7
input_mapping:
postgis_artifacts: postgis_artifacts_centos7
params:
PGOPTIONS: '-c optimizer=off'
TEST_OS: centos7
IVYREPO_HOST: {{ivyrepo_host}}
IVYREPO_REALM: {{ivyrepo_realm}}
IVYREPO_USER: {{ivyrepo_user}}
IVYREPO_PASSWD: {{ivyrepo_passwd}}

- name: MADlib_Test_Orca_centos7
plan:
Expand Down Expand Up @@ -3650,16 +3659,15 @@ jobs:
passed:
- postgis_build_centos7
- get: gcc_4.4.2_snowflake
- get: postgis_artifacts_centos7
- task: test_postgis
file: madlib_ci/concourse/tasks/test_postgis.yml
image: centos-gpdb-dev-7
input_mapping:
postgis_artifacts: postgis_artifacts_centos7
params:
PGOPTIONS: '-c optimizer=on'
TEST_OS: centos7
IVYREPO_HOST: {{ivyrepo_host}}
IVYREPO_REALM: {{ivyrepo_realm}}
IVYREPO_USER: {{ivyrepo_user}}
IVYREPO_PASSWD: {{ivyrepo_passwd}}

- name: gate_advanced_analytics_end
plan:
Expand Down
18 changes: 9 additions & 9 deletions concourse/pipelines/pr_pipeline.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,13 @@ resources:
secret_access_key: {{bucket-secret-access-key}}
versioned_file: {{binary_swap_gpdb_centos_versioned_file}}

- name: gpdb_artifacts_centos6
source:
bucket: pivotal-gpdb-concourse-resources-prod
json_key: ((concourse-gcs-resources-service-account-key))
regexp: gp-internal-artifacts/centos6/gpdb5-artifacts-centos6-(1\.0\.0).tar.gz
type: gcs

jobs:
- name: compile-and-test-pull-request
plan:
Expand All @@ -61,23 +68,16 @@ jobs:
- get: centos-gpdb-dev-6
- get: gpaddon_src
- get: gpdb_5x_upstream
- get: gpdb_artifacts_centos6
# We use the 5X_STABLE source for running make sync_tools instead for security.
# For example, this would prevent a user to submit a PR that maliciously
# modifies the sync_tools task to expose the ivy credentials.
- task: sync_tools
input_mapping:
gpdb_src: gpdb_5x_upstream
gpdb_artifacts: gpdb_artifacts_centos6
file: gpdb_5x_upstream/concourse/tasks/sync_tools.yml
image: centos-gpdb-dev-6
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
TASK_OS_VERSION: 6

- put: gpdb_pr
params:
Expand Down
Loading

0 comments on commit e975ff7

Please sign in to comment.