@@ -25,16 +25,17 @@ steps:
2525 - ' TF_VAR_folder_id=$_FOLDER_ID'
2626 - ' TF_VAR_billing_account=$_BILLING_ACCOUNT'
2727
28- # ----- SUITE simple-composer-env-v2
29-
30- - id : init-simple-composer-env-v2
28+ - id : init-all
3129 waitFor :
3230 - prepare
3331 name : ' gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
34- args : ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV2Module --stage init --verbose']
32+ args : ['/bin/bash', '-c', 'cft test run all --stage init --verbose']
33+
34+ # ----- SUITE simple-composer-env-v2
35+
3536- id : apply-simple-composer-env-v2
3637 waitFor :
37- - init-simple-composer-env-v2
38+ - init-all
3839 name : ' gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
3940 args : ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV2Module --stage apply --verbose']
4041- id : verify-simple-composer-env-v2
@@ -48,16 +49,29 @@ steps:
4849 name : ' gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
4950 args : ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV2Module --stage destroy --verbose']
5051
51- # ----- SUITE simple- composer-env-v3
52+ # ----- SUITE composer-v2-sharedvpc-prereq-local
5253
53- - id : init-simple- composer-env-v3
54+ - id : apply- composer-v2-sharedvpc-prereq
5455 waitFor :
55- - prepare
56+ - init-all
5657 name : ' gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
57- args : ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV3Module --stage init --verbose']
58+ args : ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV2SharedVpcModule --stage apply --verbose']
59+ - id : verify-composer-v2-sharedvpc-prereq
60+ waitFor :
61+ - apply-composer-v2-sharedvpc-prereq
62+ name : ' gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
63+ args : ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV2SharedVpcModule --stage verify --verbose']
64+ - id : destroy-composer-v2-sharedvpc-prereq
65+ waitFor :
66+ - verify-composer-v2-sharedvpc-prereq
67+ name : ' gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
68+ args : ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV2SharedVpcModule --stage destroy --verbose']
69+
70+ # ----- SUITE simple-composer-env-v3
71+
5872- id : apply-simple-composer-env-v3
5973 waitFor :
60- - init-simple-composer-env-v3
74+ - init-all
6175 name : ' gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
6276 args : ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV3Module --stage apply --verbose']
6377- id : verify-simple-composer-env-v3
@@ -71,31 +85,6 @@ steps:
7185 name : ' gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
7286 args : ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV3Module --stage destroy --verbose']
7387
74-
75- # ----- SUITE composer-v2-sharedvpc-prereq-local
76-
77- - id : init-composer-v2-sharedvpc-prereq
78- waitFor :
79- - destroy-simple-composer-env-v2
80- - destroy-simple-composer-env-v3
81- name : ' gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
82- args : ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV2SharedVpcModule --stage init --verbose']
83- - id : apply-composer-v2-sharedvpc-prereq
84- waitFor :
85- - init-composer-v2-sharedvpc-prereq
86- name : ' gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
87- args : ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV2SharedVpcModule --stage apply --verbose']
88- - id : verify-composer-v2-sharedvpc-prereq
89- waitFor :
90- - apply-composer-v2-sharedvpc-prereq
91- name : ' gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
92- args : ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV2SharedVpcModule --stage verify --verbose']
93- - id : destroy-composer-v2-sharedvpc-prereq
94- waitFor :
95- - verify-composer-v2-sharedvpc-prereq
96- name : ' gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
97- args : ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV2SharedVpcModule --stage destroy --verbose']
98-
9988tags :
10089- ' ci'
10190- ' integration'
0 commit comments