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

Commit fb54c0e

Browse files
yihong0618yihong0618
committed
fix: pipeline down
reasons: 1. url link change from pivotal -> gcr.io 2. now we need to use terraform.d 3. some ccp env changed
1 parent 8d85719 commit fb54c0e

File tree

2 files changed

+92
-47
lines changed

2 files changed

+92
-47
lines changed

‎concourse/pipeline-release.yml

+46-22
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ groups:
66
- greenplumPython_release
77

88
ccp_create_params_anchor: &ccp_default_params
9+
plugin_dir: ../../terraform.d/plugin-cache/linux_amd64
910
action: create
1011
delete_on_failure: true
1112
generate_random_name: true
@@ -28,12 +29,13 @@ ccp_gen_cluster_default_params_anchor: &ccp_gen_cluster_default_params
2829
ccp_destroy_anchor: &ccp_destroy
2930
put: terraform
3031
params:
32+
plugin_dir: ../../terraform.d/plugin-cache/linux_amd64
3133
action: destroy
3234
env_name_file: terraform/name
3335
terraform_source: ccp_src/google/
3436
vars:
3537
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
38+
instance_type: n1-standard-1
3739
get_params:
3840
action: destroy
3941

@@ -43,10 +45,9 @@ set_failed_anchor: &set_failed
4345
config:
4446
platform: linux
4547
image_resource:
46-
type: docker-image
48+
type: registry-image
4749
source:
48-
repository: pivotaldata/ccp
49-
tag: "7"
50+
repository: gcr.io/data-gpdb-public-images/ccp
5051
inputs:
5152
- name: ccp_src
5253
- name: terraform
@@ -63,34 +64,31 @@ set_failed_anchor: &set_failed
6364
BUCKET_PATH: clusters-google/
6465
BUCKET_NAME: {{tf-bucket-name}}
6566
#####################################################
66-
6767
resource_types:
68-
- name: gcs
69-
type: docker-image
70-
source:
71-
repository: frodenas/gcs-resource
72-
73-
- name: terraform
74-
type: docker-image
75-
source:
76-
repository: ljfranklin/terraform-resource
77-
tag: 0.11.14
68+
- name: terraform
69+
type: registry-image
70+
source:
71+
repository: ljfranklin/terraform-resource
72+
tag: 0.11.14
73+
- name: gcs
74+
type: registry-image
75+
source:
76+
repository: frodenas/gcs-resource
7877

7978
resources:
8079
# Image Resources
8180
- name: centos-gpdb-dev-7
82-
type: docker-image
81+
type: registry-image
8382
source:
84-
repository: pivotaldata/centos-gpdb-dev
85-
tag: '7-gcc6.2-llvm3.7'
83+
repository: gcr.io/data-gpdb-public-images/gpdb5-centos7-build-test
84+
tag: latest
8685

8786
- name: ubuntu18-image-test
88-
type: docker-image
87+
type: registry-image
8988
source:
90-
repository: pivotaldata/gpdb6-ubuntu18.04-test
89+
repository: gcr.io/data-gpdb-public-images/gpdb6-ubuntu18.04-test
9190
tag: latest
9291

93-
9492
- name: GreenplumPython_src
9593
type: git
9694
source:
@@ -130,6 +128,15 @@ resources:
130128
bucket: {{tf-bucket-name}}
131129
bucket_path: clusters-google/
132130

131+
- name: terraform.d
132+
source:
133+
access_key_id: ((bucket-access-key-id))
134+
bucket: ccp-terraform-provider-plugins
135+
region_name: ((aws-region))
136+
secret_access_key: ((bucket-secret-access-key))
137+
versioned_file: plugin-cache.tgz
138+
type: s3
139+
133140
- name: bin_gpdb_centos7
134141
type: gcs
135142
source:
@@ -191,6 +198,9 @@ jobs:
191198
- get: gpdb_binary
192199
resource: bin_gpdb_centos7
193200
- get: ccp_src
201+
- get: terraform.d
202+
params:
203+
unpack: true
194204
- get: centos-gpdb-dev-7
195205
- get: plcontainer_pyclient_docker_image
196206
resource: plcontainer_docker_image_centos_python
@@ -205,6 +215,11 @@ jobs:
205215
vars:
206216
<<: *ccp_default_vars
207217
PLATFORM: centos7
218+
instance_type: n1-standard-4
219+
disk_size: 100
220+
disk_type: pd-ssd
221+
zone: {{google-zone}}
222+
region: {{google-region}}
208223
- task: gen_cluster
209224
file: ccp_src/ci/tasks/gen_cluster.yml
210225
params:
@@ -233,6 +248,9 @@ jobs:
233248
- get: gpdb_binary
234249
resource: bin_gpdb_ubuntu18
235250
- get: ccp_src
251+
- get: terraform.d
252+
params:
253+
unpack: true
236254
- get: ubuntu18-image-test
237255
- get: plcontainer_pyclient_docker_image
238256
resource: plcontainer_docker_image_centos_python
@@ -247,6 +265,11 @@ jobs:
247265
vars:
248266
<<: *ccp_default_vars
249267
PLATFORM: ubuntu18.04
268+
instance_type: n1-standard-4
269+
disk_size: 100
270+
disk_type: pd-ssd
271+
zone: {{google-zone}}
272+
region: {{google-region}}
250273
- task: gen_cluster
251274
file: ccp_src/ci/tasks/gen_cluster.yml
252275
params:
@@ -278,4 +301,5 @@ jobs:
278301
- aggregate:
279302
- put: greenplumPython-release
280303
params:
281-
file: greenplumPython-release/greenplum-python-*.tar.gz
304+
file: greenplumPython-release/greenplum-python-*.tar.gz
305+

‎concourse/pipeline.yml

+46-25
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@ groups:
88
#################### RESOURCES ######################
99
#####################################################
1010
ccp_create_params_anchor: &ccp_default_params
11+
plugin_dir: ../../terraform.d/plugin-cache/linux_amd64
1112
action: create
1213
delete_on_failure: true
1314
generate_random_name: true
1415
terraform_source: ccp_src/google/
1516

1617
ccp_vars_anchor: &ccp_default_vars
17-
instance_type: n1-standard-4
18-
region: {{google-region}}
19-
zone: {{google-zone}}
20-
disk_size: 100
18+
instance_type: n1-standard-2
19+
number_of_nodes: 2
2120

2221
ccp_gen_cluster_default_params_anchor: &ccp_gen_cluster_default_params
2322
AWS_ACCESS_KEY_ID: {{tf-machine-access-key-id}}
@@ -30,12 +29,13 @@ ccp_gen_cluster_default_params_anchor: &ccp_gen_cluster_default_params
3029
ccp_destroy_anchor: &ccp_destroy
3130
put: terraform
3231
params:
32+
plugin_dir: ../../terraform.d/plugin-cache/linux_amd64
3333
action: destroy
3434
env_name_file: terraform/name
3535
terraform_source: ccp_src/google/
3636
vars:
3737
aws_instance-node-instance_type: t2.micro #t2.micro is ignored in destroy, but aws_instance-node-instance_type is required.
38-
aws_ebs_volume_type: standard
38+
instance_type: n1-standard-1
3939
get_params:
4040
action: destroy
4141

@@ -45,10 +45,9 @@ set_failed_anchor: &set_failed
4545
config:
4646
platform: linux
4747
image_resource:
48-
type: docker-image
48+
type: registry-image
4949
source:
50-
repository: pivotaldata/ccp
51-
tag: "7"
50+
repository: gcr.io/data-gpdb-public-images/ccp
5251
inputs:
5352
- name: ccp_src
5453
- name: terraform
@@ -65,34 +64,31 @@ set_failed_anchor: &set_failed
6564
BUCKET_PATH: clusters-google/
6665
BUCKET_NAME: {{tf-bucket-name}}
6766
#####################################################
68-
6967
resource_types:
70-
- name: gcs
71-
type: docker-image
72-
source:
73-
repository: frodenas/gcs-resource
74-
75-
- name: terraform
76-
type: docker-image
77-
source:
78-
repository: ljfranklin/terraform-resource
79-
tag: 0.11.14
68+
- name: terraform
69+
type: registry-image
70+
source:
71+
repository: ljfranklin/terraform-resource
72+
tag: 0.11.14
73+
- name: gcs
74+
type: registry-image
75+
source:
76+
repository: frodenas/gcs-resource
8077

8178
resources:
8279
# Image Resources
8380
- name: centos-gpdb-dev-7
84-
type: docker-image
81+
type: registry-image
8582
source:
86-
repository: pivotaldata/centos-gpdb-dev
87-
tag: '7-gcc6.2-llvm3.7'
83+
repository: gcr.io/data-gpdb-public-images/gpdb5-centos7-build-test
84+
tag: latest
8885

8986
- name: ubuntu18-image-test
90-
type: docker-image
87+
type: registry-image
9188
source:
92-
repository: pivotaldata/gpdb6-ubuntu18.04-test
89+
repository: gcr.io/data-gpdb-public-images/gpdb6-ubuntu18.04-test
9390
tag: latest
9491

95-
9692
- name: GreenplumPython_src
9793
type: git
9894
source:
@@ -132,6 +128,15 @@ resources:
132128
bucket: {{tf-bucket-name}}
133129
bucket_path: clusters-google/
134130

131+
- name: terraform.d
132+
source:
133+
access_key_id: ((bucket-access-key-id))
134+
bucket: ccp-terraform-provider-plugins
135+
region_name: ((aws-region))
136+
secret_access_key: ((bucket-secret-access-key))
137+
versioned_file: plugin-cache.tgz
138+
type: s3
139+
135140
- name: bin_gpdb_centos7
136141
type: gcs
137142
source:
@@ -187,6 +192,9 @@ jobs:
187192
- get: gpdb_binary
188193
resource: bin_gpdb_centos7
189194
- get: ccp_src
195+
- get: terraform.d
196+
params:
197+
unpack: true
190198
- get: centos-gpdb-dev-7
191199
- get: plcontainer_pyclient_docker_image
192200
resource: plcontainer_docker_image_centos_python
@@ -201,6 +209,11 @@ jobs:
201209
vars:
202210
<<: *ccp_default_vars
203211
PLATFORM: centos7
212+
instance_type: n1-standard-4
213+
disk_size: 100
214+
disk_type: pd-ssd
215+
zone: {{google-zone}}
216+
region: {{google-region}}
204217
- task: gen_cluster
205218
file: ccp_src/ci/tasks/gen_cluster.yml
206219
params:
@@ -229,6 +242,9 @@ jobs:
229242
- get: gpdb_binary
230243
resource: bin_gpdb_ubuntu18
231244
- get: ccp_src
245+
- get: terraform.d
246+
params:
247+
unpack: true
232248
- get: ubuntu18-image-test
233249
- get: plcontainer_pyclient_docker_image
234250
resource: plcontainer_docker_image_centos_python
@@ -243,6 +259,11 @@ jobs:
243259
vars:
244260
<<: *ccp_default_vars
245261
PLATFORM: ubuntu18.04
262+
instance_type: n1-standard-4
263+
disk_size: 100
264+
disk_type: pd-ssd
265+
zone: {{google-zone}}
266+
region: {{google-region}}
246267
- task: gen_cluster
247268
file: ccp_src/ci/tasks/gen_cluster.yml
248269
params:

0 commit comments

Comments
 (0)