Skip to content

Commit e0d1f17

Browse files
committed
chore: reorder v2 and v3
1 parent 5513039 commit e0d1f17

File tree

1 file changed

+24
-25
lines changed

1 file changed

+24
-25
lines changed

build/int.cloudbuild.yaml

Lines changed: 24 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -48,31 +48,6 @@ steps:
4848
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
4949
args: ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV2Module --stage destroy --verbose']
5050

51-
# ----- SUITE composer-v2-sharedvpc-prereq-local
52-
53-
- id: init-composer-v2-sharedvpc-prereq
54-
waitFor:
55-
- destroy-simple-composer-env-v2
56-
- destroy-simple-composer-env-v3
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 init --verbose']
59-
- id: apply-composer-v2-sharedvpc-prereq
60-
waitFor:
61-
- init-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 apply --verbose']
64-
- id: verify-composer-v2-sharedvpc-prereq
65-
waitFor:
66-
- apply-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 verify --verbose']
69-
- id: destroy-composer-v2-sharedvpc-prereq
70-
waitFor:
71-
- verify-composer-v2-sharedvpc-prereq
72-
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
73-
args: ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV2SharedVpcModule --stage destroy --verbose']
74-
75-
7651
# ----- SUITE simple-composer-env-v3
7752

7853
- id: init-simple-composer-env-v3
@@ -97,6 +72,30 @@ steps:
9772
args: ['/bin/bash', '-c', 'cft test run TestSimpleComposerEnvV3Module --stage destroy --verbose']
9873

9974

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+
10099
tags:
101100
- 'ci'
102101
- 'integration'

0 commit comments

Comments
 (0)