Skip to content

Commit 78e1ce9

Browse files
authored
fix: Update test execution order to fix limit of 5 network per project and metadata with output type (#507)
1 parent 6824b3c commit 78e1ce9

File tree

3 files changed

+29
-5
lines changed

3 files changed

+29
-5
lines changed

build/int.cloudbuild.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ steps:
5151
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy it-simple-local']
5252
- id: converge-it-additional-disks-local
5353
wait_for:
54-
- create-all
54+
- destroy-it-simple-local
5555
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
5656
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge it-additional-disks-local']
5757
- id: verify-it-additional-disks-local
@@ -66,7 +66,7 @@ steps:
6666
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy it-additional-disks-local']
6767
- id: converge-preemptible-and-regular-instance-templates-simple-local
6868
wait_for:
69-
- create-all
69+
- destroy-it-additional-disks-local
7070
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
7171
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge preemptible-and-regular-instance-templates-simple-local']
7272
- id: verify-preemptible-and-regular-instance-templates-simple-local
@@ -81,7 +81,7 @@ steps:
8181
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy preemptible-and-regular-instance-templates-simple-local']
8282
- id: go-init-instance-simple
8383
waitFor:
84-
- create-all
84+
- destroy-preemptible-and-regular-instance-templates-simple-local
8585
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
8686
args: ['/bin/bash', '-c', 'cd test/integration && RUN_STAGE=init go test -v -run TestInstanceSimpleModule ./... -p 1']
8787
- id: go-apply-instance-simple
@@ -103,7 +103,7 @@ steps:
103103
timeout: 1800s
104104
- id: converge-mig-simple-local
105105
wait_for:
106-
- create-all
106+
- go-destroy-instance-simple
107107
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
108108
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do converge mig-simple-local']
109109
- id: verify-mig-simple-local
@@ -238,7 +238,7 @@ steps:
238238
args: ['/bin/bash', '-c', 'source /usr/local/bin/task_helper_functions.sh && kitchen_do destroy mig-with-percent-simple-local']
239239
- id: go-init-statful-mig
240240
waitFor:
241-
- create-all
241+
- destroy-mig-with-percent-simple-local
242242
name: 'gcr.io/cloud-foundation-cicd/$_DOCKER_IMAGE_DEVELOPER_TOOLS:$_DOCKER_TAG_VERSION_DEVELOPER_TOOLS'
243243
args: ['/bin/bash', '-c', 'cft test run TestMigStatefulModule --stage create --verbose']
244244
- id: go-apply-statful-mig

modules/instance_template/metadata.yaml

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -456,14 +456,25 @@ spec:
456456
outputs:
457457
- name: name
458458
description: Name of instance template
459+
type: string
459460
- name: self_link
460461
description: Self-link of instance template
462+
type: string
461463
- name: self_link_unique
462464
description: Unique self-link of instance template (recommended output to use instead of self_link)
465+
type: string
463466
- name: service_account_info
464467
description: Service account id and email
468+
type:
469+
- object
470+
- email: string
471+
id: string
472+
member: string
465473
- name: tags
466474
description: Tags that will be associated with instance(s)
475+
type:
476+
- list
477+
- string
467478
requirements:
468479
roles:
469480
- level: Project

modules/mig/metadata.yaml

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -291,14 +291,27 @@ spec:
291291
outputs:
292292
- name: apphub_workload_uri
293293
description: Workload URI in CAIS style to be used by Apphub.
294+
type:
295+
- object
296+
- location: string
297+
workload_id: string
298+
workload_uri: string
294299
- name: health_check_self_links
295300
description: All self_links of healthchecks created for the instance group.
301+
type:
302+
- list
303+
- string
296304
- name: instance_group
297305
description: Instance-group url of managed instance group
306+
type: string
298307
- name: instance_group_manager
299308
description: An instance of google_compute_region_instance_group_manager of the instance group.
309+
type:
310+
- object
311+
- base_instance_name: string
300312
- name: self_link
301313
description: Self-link of managed instance group
314+
type: string
302315
requirements:
303316
roles:
304317
- level: Project

0 commit comments

Comments
 (0)