Skip to content

Commit 87d9391

Browse files
authored
Merge pull request #594 from cloudfoundry/merge-jammy
Merge jammy forward
2 parents 5bea30e + 6e131d3 commit 87d9391

2 files changed

Lines changed: 16 additions & 16 deletions

File tree

ci/pipelines/builder.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ jobs:
351351
params:
352352
GCP_PROJECT_ID: ((gcp_project_id))
353353
GCP_ZONE: europe-north2-a
354-
GCP_PREEMPTIBLE: true
354+
GCP_PREEMPTIBLE: false
355355
GCP_NETWORK_NAME: bosh-concourse
356356
GCP_SUBNET_NAME: stemcell-builder-integration-(@= data.values.stemcell_details.subnet_int @)
357357
GCP_JSON_KEY: ((gcp_json_key))
@@ -565,7 +565,7 @@ jobs:
565565
params:
566566
GCP_PROJECT_ID: ((gcp_project_id))
567567
GCP_ZONE: europe-north2-a
568-
GCP_PREEMPTIBLE: true
568+
GCP_PREEMPTIBLE: false
569569
GCP_NETWORK_NAME: bosh-concourse
570570
GCP_SUBNET_NAME: stemcell-builder-integration-(@= data.values.stemcell_details.subnet_int @)
571571
GCP_JSON_KEY: ((gcp_json_key))
@@ -583,7 +583,7 @@ jobs:
583583
VARS_AVAILABILITY_ZONE: europe-north2-a
584584
VARS_MACHINE_TYPE: e2-standard-2
585585
VARS_ZONE: europe-north2-a
586-
VARS_PREEMPTIBLE: true
586+
VARS_PREEMPTIBLE: false
587587
VARS_SUBNETWORK_DEFAULT: stemcell-builder-integration-(@= data.values.stemcell_details.subnet_int @)
588588
VARS_CIDR_DEFAULT: "10.100.(@= data.values.stemcell_details.subnet_int @).0/24"
589589
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'
Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
<metalink xmlns="urn:ietf:params:xml:ns:metalink">
22
<file name="ubuntu-jammy.tgz">
3-
<hash type="sha-512">68d2f0ac85cd492f6c7e23dcac164721d735ae394025a1331bec7e2167cd658bc15fe229af0f2b9eb957519a1a804859b3f2b89faf48542b8dfa6cc6324991c1</hash>
4-
<hash type="sha-256">56ba95d41f6984503e9ca04f104e7c0b358653b72ba1650b7967c608d5a15f16</hash>
5-
<hash type="sha-1">4c863bb345840c4c2686400fdd233321fdbfbc6e</hash>
6-
<hash type="md5">e3bd1cf7e2dc5f37cdf8ede1600ae642</hash>
7-
<size>434854192</size>
3+
<hash type="sha-512">303ec6a50529b061bd4d2a449001c0ff350d0e94b0f8844639039ec3fec67c26108958f0c094ddbd133617b1acbaee819c1f387aa4978e7234316241fe67bef1</hash>
4+
<hash type="sha-256">af498b1ff41d475ceae06a1af333311eb21ee69b6034e6e8ac97a89b411be2ad</hash>
5+
<hash type="sha-1">3cdfd1eb3fb82eb1beee7ab632f43924aa081105</hash>
6+
<hash type="md5">da60dff146fd66482caa4547643f35b4</hash>
7+
<size>434925866</size>
88
<url>https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/ubuntu-jammy.tgz</url>
9-
<version>1046.0.0</version>
9+
<version>1048.0.0</version>
1010
</file>
1111
<file name="usn-log.json">
12-
<hash type="sha-512">dfdcf7bff8522d3dd4aa5a1dc46cb68dff60bc961fb78d98326625a9e35049dbbd257e9d70212cabee076366d4b899071395f114139d1a4ec89aabe7cc741051</hash>
13-
<hash type="sha-256">4fad258c0f94d5ad1c9f7bfa3e588d62ce7077b2f4d524021d79667a29c191dc</hash>
14-
<hash type="sha-1">b008c5d31a9edd422fcd78f97a17222bdba30f05</hash>
15-
<hash type="md5">e777c9f1cf0d6ee4797c2f93edd551d3</hash>
16-
<size>2246</size>
12+
<hash type="sha-512">d9378b3a430af3ce967861b570ad77af08528260c4812231ff56329936c66a52c64b1c2876caae3ce5775713312dd9e26632d0252468553c1c25d0146c5d8645</hash>
13+
<hash type="sha-256">da3273890d484f72fb935f72976b752943acd99f562128ccc4759d2559f6a0ec</hash>
14+
<hash type="sha-1">8218d84e4ae3bc7831f015388ec02f43323895e1</hash>
15+
<hash type="md5">f2d841b3ccbd4dc7386e7e7b59fb72ce</hash>
16+
<size>7477</size>
1717
<url>https://storage.googleapis.com/bosh-os-images/ubuntu-jammy/usn-log.json</url>
18-
<version>1046.0.0</version>
18+
<version>1048.0.0</version>
1919
</file>
2020
<generator>metalink-repository-resource/0.0.0</generator>
21-
<published>2026-04-30T22:35:40.051014265Z</published>
21+
<published>2026-05-06T14:34:08.518246102Z</published>
2222
</metalink>

0 commit comments

Comments
 (0)