Skip to content
This repository was archived by the owner on Jul 16, 2024. It is now read-only.

Commit da25b01

Browse files
committed
fix pipeline permission bug
1 parent 63a05da commit da25b01

File tree

4 files changed

+193
-29
lines changed

4 files changed

+193
-29
lines changed

concourse/pipeline-release.yml

Lines changed: 192 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,69 @@
11
groups:
22
- name: All
33
jobs:
4-
- test_greenplumpython_light_centos7
5-
- test_greenplumpython_light_ubuntu18
4+
- test_plcontainer_centos7
5+
- test_plcontainer_ubuntu18
66
- greenplumPython_release
77

8+
ccp_create_params_anchor: &ccp_default_params
9+
action: create
10+
delete_on_failure: true
11+
generate_random_name: true
12+
terraform_source: ccp_src/google/
13+
14+
ccp_vars_anchor: &ccp_default_vars
15+
instance_type: n1-standard-4
16+
region: {{google-region}}
17+
zone: {{google-zone}}
18+
disk_size: 100
19+
20+
ccp_gen_cluster_default_params_anchor: &ccp_gen_cluster_default_params
21+
AWS_ACCESS_KEY_ID: {{tf-machine-access-key-id}}
22+
AWS_SECRET_ACCESS_KEY: {{tf-machine-secret-access-key}}
23+
AWS_DEFAULT_REGION: {{aws-region}}
24+
BUCKET_PATH: clusters-google/
25+
BUCKET_NAME: {{tf-bucket-name}}
26+
CLOUD_PROVIDER: google
27+
28+
ccp_destroy_anchor: &ccp_destroy
29+
put: terraform
30+
params:
31+
action: destroy
32+
env_name_file: terraform/name
33+
terraform_source: ccp_src/google/
34+
vars:
35+
aws_instance-node-instance_type: t2.micro #t2.micro is ignored in destroy, but aws_instance-node-instance_type is required.
36+
aws_ebs_volume_type: standard
37+
get_params:
38+
action: destroy
39+
40+
set_failed_anchor: &set_failed
41+
do:
42+
- task: on_failure_set_failed
43+
config:
44+
platform: linux
45+
image_resource:
46+
type: docker-image
47+
source:
48+
repository: pivotaldata/ccp
49+
tag: "7"
50+
inputs:
51+
- name: ccp_src
52+
- name: terraform
53+
run:
54+
path: 'ccp_src/google/ccp_failed_test.sh'
55+
params:
56+
GOOGLE_CREDENTIALS: {{google-service-account-key}}
57+
GOOGLE_PROJECT_ID: {{google-project-id}}
58+
GOOGLE_ZONE: {{google-zone}}
59+
GOOGLE_SERVICE_ACCOUNT: {{google-service-account}}
60+
AWS_ACCESS_KEY_ID: {{tf-machine-access-key-id}}
61+
AWS_SECRET_ACCESS_KEY: {{tf-machine-secret-access-key}}
62+
AWS_DEFAULT_REGION: {{tf-machine-region}}
63+
BUCKET_PATH: clusters-google/
64+
BUCKET_NAME: {{tf-bucket-name}}
65+
#####################################################
66+
867
resource_types:
968
- name: gcs
1069
type: docker-image
@@ -31,22 +90,46 @@ resources:
3190
repository: pivotaldata/gpdb6-ubuntu18.04-test
3291
tag: latest
3392

34-
# Github Source Codes
35-
- name: gpdb_src
36-
type: git
37-
source:
38-
branch: 6X_STABLE
39-
uri: https://github.com/greenplum-db/gpdb.git
40-
ignore_paths:
41-
- gpdb-doc/*
42-
- README*
4393

4494
- name: GreenplumPython_src
4595
type: git
4696
source:
4797
branch: master
4898
uri: https://github.com/greenplum-db/GreenplumPython.git
4999

100+
# ccp_src tag_filter is not maintained by gpdb_common-ci-secrets.yml
101+
# so we just pull the laster ccp_src without tag_filter
102+
- name: ccp_src
103+
type: git
104+
source:
105+
branch: {{ccp-git-branch}}
106+
private_key: {{ccp-git-key}}
107+
uri: {{ccp-git-remote}}
108+
109+
- name: plcontainer_src
110+
type: git
111+
source:
112+
branch: master
113+
uri: https://github.com/greenplum-db/plcontainer.git
114+
115+
- name: terraform
116+
type: terraform
117+
source:
118+
env:
119+
AWS_ACCESS_KEY_ID: {{tf-machine-access-key-id}}
120+
AWS_SECRET_ACCESS_KEY: {{tf-machine-secret-access-key}}
121+
GOOGLE_CREDENTIALS: {{google-service-account-key}}
122+
vars:
123+
project_id: {{google-project-id}}
124+
storage:
125+
access_key_id: {{tf-machine-access-key-id}}
126+
secret_access_key: {{tf-machine-secret-access-key}}
127+
region_name: {{aws-region}}
128+
# This is not parameterized, on purpose. All tfstates will go to this spot,
129+
# and different teams will place there clusters' tfstate files under different paths
130+
bucket: {{tf-bucket-name}}
131+
bucket_path: clusters-google/
132+
50133
- name: bin_gpdb_centos7
51134
type: gcs
52135
source:
@@ -61,6 +144,34 @@ resources:
61144
json_key: ((concourse-gcs-resources-service-account-key))
62145
versioned_file: 6X_STABLE/bin_gpdb_ubuntu18.04/bin_gpdb.tar.gz
63146

147+
- name: plcontainer_docker_image_centos_python
148+
type: gcs
149+
source:
150+
bucket: {{gcs-bucket-intermediates}}
151+
json_key: {{concourse-gcs-resources-service-account-key}}
152+
versioned_file: plcontainer/published/gpdb6/plcontainer-python3-images-devel.tar.gz
153+
154+
- name: bin_plcontainer_centos7
155+
type: gcs
156+
source:
157+
bucket: {{gcs-bucket}}
158+
json_key: {{concourse-gcs-resources-service-account-key}}
159+
regexp: plcontainer/released/gpdb6/plcontainer-(2.*)-gp6-rhel7_x86_64.gppkg
160+
161+
- name: bin_plcontainer_ubuntu18
162+
type: gcs
163+
source:
164+
bucket: {{gcs-bucket}}
165+
json_key: {{concourse-gcs-resources-service-account-key}}
166+
regexp: plcontainer/released/gpdb6/plcontainer-(2.*)-gp6-ubuntu18.04_x86_64.gppkg
167+
168+
- name: plcontainer_gpdb_ubuntu18_build_lib
169+
type: gcs
170+
source:
171+
bucket: {{gcs-bucket-intermediates}}
172+
json_key: {{concourse-gcs-resources-service-account-key}}
173+
versioned_file: plcontainer/published/gpdb6/plcontainer-concourse-ubuntu18-lib.tar.gz
174+
64175
- name: greenplumPython-release
65176
type: gcs
66177
source:
@@ -69,37 +180,90 @@ resources:
69180
regexp: pl-analysis-suite/released/gpdb6/greenplumPython-(.*).tar.gz
70181

71182
jobs:
72-
- name: test_greenplumpython_light_centos7
183+
# test GrenplumPython for plcontainer
184+
- name: test_plcontainer_centos7
73185
plan:
74186
- aggregate:
75-
- get: gpdb_src
187+
- get: plcontainer_src
76188
- get: GreenplumPython_src
77189
trigger: true
78-
- get: bin_gpdb
190+
# this name is needed by ccp to gencluster
191+
- get: gpdb_binary
79192
resource: bin_gpdb_centos7
80-
- get: bin_plr
81-
resource: bin_plr_centos7
193+
- get: ccp_src
82194
- get: centos-gpdb-dev-7
83-
- task: test_greenplumr_plr_centos7
84-
file: GreenplumPython_src/concourse/tasks/test_plr.yml
85-
image: centos-gpdb-dev-7
195+
- get: plcontainer_pyclient_docker_image
196+
resource: plcontainer_docker_image_centos_python
197+
trigger: true
198+
- get: bin_plcontainer
199+
resource: bin_plcontainer_centos7
200+
trigger: true
201+
- get: plcontainer_gpdb_ubuntu18_build_lib
202+
- put: terraform
86203
params:
204+
<<: *ccp_default_params
205+
vars:
206+
<<: *ccp_default_vars
207+
PLATFORM: centos7
208+
- task: gen_cluster
209+
file: ccp_src/ci/tasks/gen_cluster.yml
210+
params:
211+
<<: *ccp_gen_cluster_default_params
212+
PLATFORM: centos7
213+
- task: gpinitsystem
214+
file: ccp_src/ci/tasks/gpinitsystem.yml
215+
- task: test_greenplumpython_plcontainer
216+
file: GreenplumPython_src/concourse/tasks/test_plcontainer.yml
217+
params:
218+
MODE: full
219+
platform: centos7
220+
image: centos-gpdb-dev-7
221+
on_success:
222+
<<: *ccp_destroy
223+
ensure:
224+
<<: *set_failed
87225

88-
- name: test_greenplumpython_light_ubuntu18
226+
- name: test_plcontainer_ubuntu18
89227
plan:
90228
- aggregate:
91-
- get: gpdb_src
229+
- get: plcontainer_src
92230
- get: GreenplumPython_src
93231
trigger: true
94-
- get: bin_gpdb
232+
# this name is needed by ccp to gencluster
233+
- get: gpdb_binary
95234
resource: bin_gpdb_ubuntu18
96-
- get: bin_plr
97-
resource: bin_plr_ubuntu18
235+
- get: ccp_src
98236
- get: ubuntu18-image-test
99-
- task: test_greenplumr_plr
100-
file: GreenplumPython_src/concourse/tasks/test_plr.yml
101-
image: ubuntu18-image-test
237+
- get: plcontainer_pyclient_docker_image
238+
resource: plcontainer_docker_image_centos_python
239+
trigger: true
240+
- get: bin_plcontainer
241+
resource: bin_plcontainer_ubuntu18
242+
trigger: true
243+
- get: plcontainer_gpdb_ubuntu18_build_lib
244+
- put: terraform
102245
params:
246+
<<: *ccp_default_params
247+
vars:
248+
<<: *ccp_default_vars
249+
PLATFORM: ubuntu18.04
250+
- task: gen_cluster
251+
file: ccp_src/ci/tasks/gen_cluster.yml
252+
params:
253+
<<: *ccp_gen_cluster_default_params
254+
PLATFORM: ubuntu18.04
255+
- task: gpinitsystem
256+
file: ccp_src/ci/tasks/gpinitsystem.yml
257+
- task: test_greenplumpython_plcontainer
258+
file: GreenplumPython_src/concourse/tasks/test_plcontainer.yml
259+
params:
260+
MODE: full
261+
platform: ubuntu18
262+
image: ubuntu18-image-test
263+
on_success:
264+
<<: *ccp_destroy
265+
ensure:
266+
<<: *set_failed
103267

104268
# Release GreenplumPython GP Package
105269
- name: greenplumPython_release
@@ -109,7 +273,7 @@ jobs:
109273
- get: centos-gpdb-dev-7
110274
- get: GreenplumPython_src
111275
- task: plcontainer_gpdb_build
112-
file: GreenplumPython_src/concourse/tasks/greenplumPython_release.yml
276+
file: GreenplumPython_src/concourse/tasks/greenplumpython_release.yml
113277
image: centos-gpdb-dev-7
114278
- aggregate:
115279
- put: greenplumPython-release

concourse/pipeline.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,7 @@ resources:
176176

177177
jobs:
178178

179-
# test GrenplumR for plcontainer
179+
# test GrenplumPython for plcontainer
180180
- name: test_plcontainer_centos7
181181
plan:
182182
- aggregate:

concourse/scripts/greenplumpython_release.sh

100644100755
File mode changed.

concourse/scripts/test_plcontainer_python_prepare.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)