@@ -31,42 +31,6 @@ steps:
3131 name : ' gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
3232 args : ['/bin/bash', '-c', 'cft test run all --stage init --verbose']
3333
34- # ----- SUITE simple-composer-env-v2
35-
36- - id : apply-simple-composer-env-v2
37- waitFor :
38- - init-all
39- name : ' gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
40- args : ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV2Module --stage apply --verbose']
41- - id : verify-simple-composer-env-v2
42- waitFor :
43- - apply-simple-composer-env-v2
44- name : ' gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
45- args : ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV2Module --stage verify --verbose']
46- - id : destroy-simple-composer-env-v2
47- waitFor :
48- - verify-simple-composer-env-v2
49- name : ' gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
50- args : ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV2Module --stage destroy --verbose']
51-
52- # ----- SUITE composer-v2-sharedvpc-prereq-local
53-
54- - id : apply-composer-v2-sharedvpc-prereq
55- waitFor :
56- - init-all
57- name : ' gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
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-
7034# ----- SUITE simple-composer-env-v3
7135
7236- id : apply-simple-composer-env-v3
@@ -79,11 +43,12 @@ steps:
7943 - apply-simple-composer-env-v3
8044 name : ' gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
8145 args : ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV3Module --stage verify --verbose']
82- - id : destroy-simple-composer-env-v3
46+
47+ - id : destroy-all
8348 waitFor :
8449 - verify-simple-composer-env-v3
8550 name : ' gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
86- args : ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV3Module --stage destroy --verbose']
51+ args : ['/bin/bash', '-c', 'cft test run all --stage destroy --verbose']
8752
8853tags :
8954- ' ci'
0 commit comments