From c8531e7f527bc4271aeb82a060f64bf63b39512c Mon Sep 17 00:00:00 2001
From: CI Bot <infra@cloudfoundry.org>
Date: Tue, 3 Nov 2026 21:41:50 +0000
Subject: [PATCH 1/2] Bump os-image tgz

---
 image-metalinks/ubuntu-noble/ubuntu-noble.meta4 | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/image-metalinks/ubuntu-noble/ubuntu-noble.meta4 b/image-metalinks/ubuntu-noble/ubuntu-noble.meta4
index 693c3cfe5..70c2ef6de 100644
--- a/image-metalinks/ubuntu-noble/ubuntu-noble.meta4
+++ b/image-metalinks/ubuntu-noble/ubuntu-noble.meta4
@@ -1,12 +1,12 @@
 <metalink xmlns="urn:ietf:params:xml:ns:metalink">
   <file name="ubuntu-noble.tgz">
-    <hash type="sha-512">4466f80a9dfce4d4b3807565bbf22827797cc4eafe2a89b59052e170ecf5bd4415c1821ccc2eba8e166dc495bf38bd8ecbe15cbdc1bd387aa048c7a10f38f765</hash>
-    <hash type="sha-256">be5d277130152b062b6de98213a7c113cc7e5e3ff8fbabd8f4c0f651e5548307</hash>
-    <hash type="sha-1">4c218cfc33794664e8eee4409786380058b52b27</hash>
-    <hash type="md5">1929c3018bfa9fac3ee70ca48c615750</hash>
-    <size>384163440</size>
+    <hash type="sha-512">f6c06e1ac75d8deaa775dbd54551b5085caa598f6c65c007504432a662795c852e5d580c5e371c53ddf6d5d6e31bb8f643f11b7c5cd04b7a3b9f78310f0aef8e</hash>
+    <hash type="sha-256">a0e1e011b978276836aa08e623e6e2f7122715e576bca977f02e13a11def313d</hash>
+    <hash type="sha-1">e0d2d7fb646729921bb61071857bd33dfdc7af39</hash>
+    <hash type="md5">d2f90ea04e8c91f9f98511dc3cad2872</hash>
+    <size>384198236</size>
     <url>https://storage.googleapis.com/bosh-os-images/ubuntu-noble/ubuntu-noble.tgz</url>
-    <version>373.0.0</version>
+    <version>374.0.0</version>
   </file>
   <file name="usn-log.json">
     <hash type="sha-512">be688838ca8686e5c90689bf2ab585cef1137c999b48c70b92f67a5c34dc15697b5d11c982ed6d71be1e1e7f7b4e0733884aa97c3f7a339a8ed03577cf74be09</hash>
@@ -15,8 +15,8 @@
     <hash type="md5">68b329da9893e34099c7d8ad5cb9c940</hash>
     <size>1</size>
     <url>https://storage.googleapis.com/bosh-os-images/ubuntu-noble/usn-log.json</url>
-    <version>373.0.0</version>
+    <version>374.0.0</version>
   </file>
   <generator>metalink-repository-resource/0.0.0</generator>
-  <published>2026-11-03T02:43:25.544311063Z</published>
+  <published>2026-11-03T21:41:35.824840924Z</published>
 </metalink>

From 1c1fef96be6dbef933e2d47a39b7cee8d10790e5 Mon Sep 17 00:00:00 2001
From: aram price <aram.price@broadcom.com>
Date: Tue, 3 Nov 2026 14:43:06 -0800
Subject: [PATCH 2/2] Follow the bosh-deployment default branch

---
 ci/pipeline-template.yml         | 1 -
 ci/tasks/gcp/deploy-director.yml | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/ci/pipeline-template.yml b/ci/pipeline-template.yml
index 95573ce83..e44652bd8 100644
--- a/ci/pipeline-template.yml
+++ b/ci/pipeline-template.yml
@@ -1811,7 +1811,6 @@ resources:
 - name: bosh-deployment
   type: git
   source:
-    branch: master
     uri: https://github.com/cloudfoundry/bosh-deployment
 
 - name: (@= data.values.stemcell_details.os_short_name @)-usn-low-medium
diff --git a/ci/tasks/gcp/deploy-director.yml b/ci/tasks/gcp/deploy-director.yml
index 4e048a0a6..09e1bbc61 100644
--- a/ci/tasks/gcp/deploy-director.yml
+++ b/ci/tasks/gcp/deploy-director.yml
@@ -11,7 +11,7 @@ outputs:
   - name: director-state
 
 params:
-  DEFAULT_VM_TYPE: n1-standard-2 # chosen to match what is currently in https://github.com/cloudfoundry/bosh-deployment/blob/master/gcp/cloud-config.yml#L15
+  DEFAULT_VM_TYPE: n1-standard-2 # chosen to match what is currently in https://github.com/cloudfoundry/bosh-deployment/blob/main/gcp/cloud-config.yml#L15
   PIPELINE_LABEL: # required - GCP label (pipeline=<value>) for the resources this task creates