Skip to content

Commit b62f580

Browse files
committed
CI: rename GCP subnets used for integration specs
1 parent e73c878 commit b62f580

2 files changed

Lines changed: 6 additions & 6 deletions

File tree

ci/pipelines/builder.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -358,7 +358,7 @@ jobs:
358358
GCP_ZONE: europe-north2-a
359359
GCP_PREEMPTIBLE: true
360360
GCP_NETWORK_NAME: bosh-concourse
361-
GCP_SUBNET_NAME: bosh-integration-(@= data.values.stemcell_details.subnet_int @)
361+
GCP_SUBNET_NAME: stemcell-builder-integration-(@= data.values.stemcell_details.subnet_int @)
362362
GCP_JSON_KEY: ((gcp_json_key))
363363
INTERNAL_IP: 10.100.(@= data.values.stemcell_details.subnet_int @).10
364364
INTERNAL_CIDR: 10.100.(@= data.values.stemcell_details.subnet_int @).0/24
@@ -425,7 +425,7 @@ jobs:
425425
GCP_PROJECT_ID: ((gcp_project_id))
426426
GCP_ZONE: europe-north2-a
427427
GCP_NETWORK_NAME: ipv6-test
428-
GCP_SUBNET_NAME: bosh-integration-ipv6-(@= data.values.stemcell_details.subnet_int @)
428+
GCP_SUBNET_NAME: stemcell-builder-integration-ipv6-(@= data.values.stemcell_details.subnet_int @)
429429
GCP_JSON_KEY: ((gcp_json_key))
430430
INTERNAL_IP: 10.100.(@= data.values.stemcell_details.subnet_int @).10
431431
INTERNAL_CIDR: 10.100.(@= data.values.stemcell_details.subnet_int @).0/24
@@ -561,7 +561,7 @@ jobs:
561561
GCP_JSON_KEY: ((gcp_json_key))
562562
GCP_PROJECT_ID: ((gcp_project_id))
563563
GCP_ZONE: europe-north2-a
564-
GCP_SUBNET_NAME: bosh-integration-(@= data.values.stemcell_details.subnet_int @)
564+
GCP_SUBNET_NAME: stemcell-builder-integration-(@= data.values.stemcell_details.subnet_int @)
565565
TAG: test-stemcells-bats
566566
- task: deploy-director
567567
file: bosh-stemcells-ci/ci/tasks/gcp/deploy-director.yml
@@ -571,7 +571,7 @@ jobs:
571571
GCP_ZONE: europe-north2-a
572572
GCP_PREEMPTIBLE: true
573573
GCP_NETWORK_NAME: bosh-concourse
574-
GCP_SUBNET_NAME: bosh-integration-(@= data.values.stemcell_details.subnet_int @)
574+
GCP_SUBNET_NAME: stemcell-builder-integration-(@= data.values.stemcell_details.subnet_int @)
575575
GCP_JSON_KEY: ((gcp_json_key))
576576
INTERNAL_IP: 10.100.(@= data.values.stemcell_details.subnet_int @).66
577577
INTERNAL_CIDR: 10.100.(@= data.values.stemcell_details.subnet_int @).0/24
@@ -588,7 +588,7 @@ jobs:
588588
VARS_MACHINE_TYPE: e2-standard-2
589589
VARS_ZONE: europe-north2-a
590590
VARS_PREEMPTIBLE: true
591-
VARS_SUBNETWORK_DEFAULT: bosh-integration-(@= data.values.stemcell_details.subnet_int @)
591+
VARS_SUBNETWORK_DEFAULT: stemcell-builder-integration-(@= data.values.stemcell_details.subnet_int @)
592592
VARS_CIDR_DEFAULT: "10.100.(@= data.values.stemcell_details.subnet_int @).0/24"
593593
VARS_RESERVED_DEFAULT: '10.100.(@= data.values.stemcell_details.subnet_int @).2 - 10.100.(@= data.values.stemcell_details.subnet_int @).129, 10.100.(@= data.values.stemcell_details.subnet_int @).190 - 10.100.(@= data.values.stemcell_details.subnet_int @).254'
594594
VARS_STATIC_DEFAULT: '10.100.(@= data.values.stemcell_details.subnet_int @).130 - 10.100.(@= data.values.stemcell_details.subnet_int @).155'

ci/pipelines/vars.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ stemcell_details:
2121
{iaas: aws, hypervisor: xen-hvm},
2222
{iaas: google, hypervisor: kvm},
2323
]
24-
subnet_int: "3"
24+
subnet_int: "22" #! use last two digits of release year: ex 2000 -> 20
2525

2626
blobstore_types:
2727
- dav

0 commit comments

Comments
 (0)