From d42e9fd782dc1f46e0bf105d07aad8736f764c36 Mon Sep 17 00:00:00 2001
From: Ben Corlett <ben.corlett@digital.cabinet-office.gov.uk>
Date: Wed, 13 Sep 2023 09:47:04 +0100
Subject: [PATCH 1/4] Upgrade cloud foundry to cf 32.7.0

---
 concourse/pipelines/create-cloudfoundry.yml                 | 4 ++--
 concourse/pipelines/monitor-remote.yml                      | 2 +-
 manifests/cf-deployment                                     | 2 +-
 manifests/cf-manifest/operations.d/320-cc-release.yml       | 6 +++---
 .../cf-manifest/spec/manifest/release_versions_spec.rb      | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/concourse/pipelines/create-cloudfoundry.yml b/concourse/pipelines/create-cloudfoundry.yml
index 05786e8433..a83b5ebd1b 100644
--- a/concourse/pipelines/create-cloudfoundry.yml
+++ b/concourse/pipelines/create-cloudfoundry.yml
@@ -543,13 +543,13 @@ resources:
     type: git
     source:
       uri: https://github.com/cloudfoundry/cf-acceptance-tests
-      branch: cf32.1
+      branch: cf32.7
 
   - name: cf-smoke-tests-release
     type: git
     source:
       uri: https://github.com/cloudfoundry/cf-smoke-tests-release
-      tag_filter: "42.0.88"
+      tag_filter: "42.0.93"
       submodules:
       - "src/smoke_tests"
 
diff --git a/concourse/pipelines/monitor-remote.yml b/concourse/pipelines/monitor-remote.yml
index 5ff0e129fd..e192d7d2e9 100644
--- a/concourse/pipelines/monitor-remote.yml
+++ b/concourse/pipelines/monitor-remote.yml
@@ -28,7 +28,7 @@ resources:
   type: git
   source:
     uri: https://github.com/cloudfoundry/cf-smoke-tests-release
-    tag_filter: "42.0.88"
+    tag_filter: "42.0.93"
     submodules:
       - "src/smoke_tests"
 
diff --git a/manifests/cf-deployment b/manifests/cf-deployment
index 29a8de0970..a83a673274 160000
--- a/manifests/cf-deployment
+++ b/manifests/cf-deployment
@@ -1 +1 @@
-Subproject commit 29a8de09708a5a62cfa82f777459c4081f105dad
+Subproject commit a83a67327421902ec85321678f3bc8d3b633f851
diff --git a/manifests/cf-manifest/operations.d/320-cc-release.yml b/manifests/cf-manifest/operations.d/320-cc-release.yml
index c54b6829d6..e37690f724 100644
--- a/manifests/cf-manifest/operations.d/320-cc-release.yml
+++ b/manifests/cf-manifest/operations.d/320-cc-release.yml
@@ -3,6 +3,6 @@
   path: /releases/name=capi
   value:
     name: "capi"
-    version: "1.157.0"
-    url: "https://bosh.io/d/github.com/cloudfoundry/capi-release?v=1.157.0"
-    sha1: "2b26a1fbc8593cb8b1465e1d3a32c0f9cd3ace1e"
+    version: "1.160.0"
+    url: "https://bosh.io/d/github.com/cloudfoundry/capi-release?v=1.160.0"
+    sha1: "441762d69c857eaeec7260713ce818698b0d6b21"
diff --git a/manifests/cf-manifest/spec/manifest/release_versions_spec.rb b/manifests/cf-manifest/spec/manifest/release_versions_spec.rb
index d57950682c..3004e360b4 100644
--- a/manifests/cf-manifest/spec/manifest/release_versions_spec.rb
+++ b/manifests/cf-manifest/spec/manifest/release_versions_spec.rb
@@ -76,7 +76,7 @@ def get_manifest_releases
     # - attempted login using an unknown/unrelated Google account
     #
     # these are tricky to automate due to their reliance on SSO and/or email.
-    tested_uaa_version = "76.18.0"
+    tested_uaa_version = "76.20.0"
     manifest_releases = get_manifest_releases
 
     expect(manifest_releases).to have_key("uaa"), "expected release for uaa to be found in manifest"

From 34d400b876a43887cc1eb6cbf40c87f79f989823 Mon Sep 17 00:00:00 2001
From: Ben Corlett <ben.corlett@digital.cabinet-office.gov.uk>
Date: Wed, 13 Sep 2023 14:55:57 +0100
Subject: [PATCH 2/4] Bump docker images for new cf-acceptance-tests image with
 golang 1.21.1

---
 concourse/pipelines/create-cloudfoundry.yml   | 36 +++++++++----------
 concourse/pipelines/deployment-kick-off.yml   |  8 ++---
 concourse/pipelines/destroy-cloudfoundry.yml  | 10 +++---
 .../fast-startup-and-shutdown-cf-env.yml      |  6 ++--
 concourse/pipelines/monitor-remote.yml        |  2 +-
 .../pipelines/test-certificate-rotation.yml   |  8 ++---
 .../aiven-broker-acceptance-tests-run.yml     |  2 +-
 .../app-autoscaler-acceptance-tests-run.yml   |  2 +-
 .../tasks/check-az-is-enabled-in-manifest.yml |  2 +-
 .../tasks/check-az-is-enabled-in-vpc.yml      |  2 +-
 .../check-billing-comparison-with-cf.yml      |  2 +-
 concourse/tasks/configure-grafana.yml         |  2 +-
 concourse/tasks/create_admin.yml              |  2 +-
 concourse/tasks/create_nonadmin.yml           |  2 +-
 .../tasks/cronitor-monitor-ping-action.yml    |  2 +-
 concourse/tasks/curl-az-healthcheck.yml       |  2 +-
 .../tasks/custom-acceptance-tests-run.yml     |  2 +-
 .../custom-broker-acceptance-tests-run.yml    |  2 +-
 concourse/tasks/delete_user.yml               |  2 +-
 concourse/tasks/forget-access-keys.yml        |  2 +-
 concourse/tasks/generate-git-keys.yml         |  2 +-
 concourse/tasks/generate-test-config.yml      |  2 +-
 concourse/tasks/get-cf-cli-config.yml         |  2 +-
 concourse/tasks/remove-db.yml                 |  2 +-
 concourse/tasks/send-nagging-email-alert.yml  |  2 +-
 concourse/tasks/smoke-tests-run.yml           |  2 +-
 concourse/tasks/tag-repo.yml                  |  2 +-
 concourse/tasks/upload-test-artifacts.yml     |  2 +-
 .../tasks/wait-for-api-availability-tests.yml |  2 +-
 .../tasks/wait-for-app-availability-tests.yml |  2 +-
 30 files changed, 59 insertions(+), 59 deletions(-)

diff --git a/concourse/pipelines/create-cloudfoundry.yml b/concourse/pipelines/create-cloudfoundry.yml
index a83b5ebd1b..ef2e8c105a 100644
--- a/concourse/pipelines/create-cloudfoundry.yml
+++ b/concourse/pipelines/create-cloudfoundry.yml
@@ -11,72 +11,72 @@ meta:
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/alpine
-        tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
     psql: &psql-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/psql
-        tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
     node: &node-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/node
-        tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
     node-chromium: &node-chromium-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/node-chromium
-        tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
     awscli: &awscli-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/awscli
-        tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
     bosh-cli-v2: &gov-paas-bosh-cli-v2-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/bosh-cli-v2
-        tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
     cf-acceptance-tests: &cf-acceptance-tests-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/cf-acceptance-tests
-        tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
     cf-cli: &cf-cli-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/cf-cli
-        tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
     cf-uaac: &cf-uaac-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/cf-uaac
-        tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
     git-ssh: &git-ssh-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/git-ssh
-        tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
     ruby-slim: &ruby-slim-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/ruby
-        tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
     golang: &golang-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/golang
-        tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
     terraform: &terraform-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/terraform
-        tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
     curl-ssl: &curl-ssl-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/curl-ssl
-        tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 
 
   tasks:
@@ -272,7 +272,7 @@ resource_types:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/concourse-pool-resource
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 
 - name: s3-iam
   type: registry-image
@@ -822,7 +822,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/self-update-pipelines
-              tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 
           inputs:
             - name: paas-cf
@@ -5386,7 +5386,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/spruce
-              tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 
           inputs:
             - name: paas-cf
@@ -6647,7 +6647,7 @@ jobs:
           type: registry-image
           source:
             repository: ghcr.io/alphagov/paas/cf-uaac
-            tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+            tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 
         inputs:
           - name: passwords
diff --git a/concourse/pipelines/deployment-kick-off.yml b/concourse/pipelines/deployment-kick-off.yml
index d4c4427566..8758dd761b 100644
--- a/concourse/pipelines/deployment-kick-off.yml
+++ b/concourse/pipelines/deployment-kick-off.yml
@@ -41,7 +41,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/alpine
-              tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
           inputs:
             - name: paas-cf
             - name: deployment-timer
@@ -71,7 +71,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/awscli
-              tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 
           run:
             path: ./paas-cf/concourse/scripts/rds_instances.sh
@@ -86,7 +86,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/self-update-pipelines
-              tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 
           inputs:
             - name: paas-cf
@@ -119,7 +119,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/self-update-pipelines
-              tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 
           inputs:
             - name: paas-cf
diff --git a/concourse/pipelines/destroy-cloudfoundry.yml b/concourse/pipelines/destroy-cloudfoundry.yml
index d8746df7f7..585dce13ba 100644
--- a/concourse/pipelines/destroy-cloudfoundry.yml
+++ b/concourse/pipelines/destroy-cloudfoundry.yml
@@ -99,7 +99,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/self-update-pipelines
-              tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 
           inputs:
             - name: paas-cf
@@ -144,7 +144,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/cf-cli
-              tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
           inputs:
             - name: paas-cf
             - name: config
@@ -189,7 +189,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/bosh-cli-v2
-              tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 
           inputs:
             - name: bosh-vars-store
@@ -243,7 +243,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/ruby
-              tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
           inputs:
             - name: paas-cf
             - name: cf-tfstate
@@ -287,7 +287,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/terraform
-              tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 
           inputs:
             - name: terraform-variables
diff --git a/concourse/pipelines/fast-startup-and-shutdown-cf-env.yml b/concourse/pipelines/fast-startup-and-shutdown-cf-env.yml
index 46bcb5a3f2..661ea02258 100644
--- a/concourse/pipelines/fast-startup-and-shutdown-cf-env.yml
+++ b/concourse/pipelines/fast-startup-and-shutdown-cf-env.yml
@@ -102,7 +102,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/self-update-pipelines
-              tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
           inputs:
             - name: paas-cf
           params:
@@ -166,7 +166,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/fast-startup-and-shutdown
-              tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
           run:
             path: bash
             args:
@@ -207,7 +207,7 @@ jobs:
             type: registry-image
             source:
               repository: ghcr.io/alphagov/paas/fast-startup-and-shutdown
-              tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+              tag: b5568301ae03da8220c5ea2f907088dfa38e963d
           run:
             path: bash
             args:
diff --git a/concourse/pipelines/monitor-remote.yml b/concourse/pipelines/monitor-remote.yml
index e192d7d2e9..91b517c5aa 100644
--- a/concourse/pipelines/monitor-remote.yml
+++ b/concourse/pipelines/monitor-remote.yml
@@ -57,7 +57,7 @@ jobs:
         type: registry-image
         source:
           repository: ghcr.io/alphagov/paas/self-update-pipelines
-          tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+          tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 
       inputs:
       - name: paas-cf
diff --git a/concourse/pipelines/test-certificate-rotation.yml b/concourse/pipelines/test-certificate-rotation.yml
index 5290195cff..b41754d29e 100644
--- a/concourse/pipelines/test-certificate-rotation.yml
+++ b/concourse/pipelines/test-certificate-rotation.yml
@@ -5,25 +5,25 @@ meta:
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/awscli
-        tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 
     bosh-cli-v2: &gov-paas-bosh-cli-v2-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/bosh-cli-v2
-        tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 
     cf-acceptance-tests: &cf-acceptance-tests-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/cf-acceptance-tests
-        tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 
     cf-cli: &cf-cli-image-resource
       type: registry-image
       source:
         repository: ghcr.io/alphagov/paas/cf-cli
-        tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+        tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 
 
 resource_types:
diff --git a/concourse/tasks/aiven-broker-acceptance-tests-run.yml b/concourse/tasks/aiven-broker-acceptance-tests-run.yml
index 904420637a..f91e78a3ca 100644
--- a/concourse/tasks/aiven-broker-acceptance-tests-run.yml
+++ b/concourse/tasks/aiven-broker-acceptance-tests-run.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/cf-acceptance-tests
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 inputs:
   - name: paas-cf
   - name: test-config
diff --git a/concourse/tasks/app-autoscaler-acceptance-tests-run.yml b/concourse/tasks/app-autoscaler-acceptance-tests-run.yml
index 46a0edf795..5222b721c2 100644
--- a/concourse/tasks/app-autoscaler-acceptance-tests-run.yml
+++ b/concourse/tasks/app-autoscaler-acceptance-tests-run.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/cf-acceptance-tests
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 inputs:
   - name: paas-cf
   - name: admin-creds
diff --git a/concourse/tasks/check-az-is-enabled-in-manifest.yml b/concourse/tasks/check-az-is-enabled-in-manifest.yml
index 30a320af48..5c9b0c8f0b 100644
--- a/concourse/tasks/check-az-is-enabled-in-manifest.yml
+++ b/concourse/tasks/check-az-is-enabled-in-manifest.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/bosh-cli-v2
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 params:
   DEPLOY_ENV:
   BOSH_ENVIRONMENT:
diff --git a/concourse/tasks/check-az-is-enabled-in-vpc.yml b/concourse/tasks/check-az-is-enabled-in-vpc.yml
index 970508d49b..10cc6bf71d 100644
--- a/concourse/tasks/check-az-is-enabled-in-vpc.yml
+++ b/concourse/tasks/check-az-is-enabled-in-vpc.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/awscli
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 params:
   AWS_DEFAULT_REGION:
   EXPECTED_ACL_NAME:
diff --git a/concourse/tasks/check-billing-comparison-with-cf.yml b/concourse/tasks/check-billing-comparison-with-cf.yml
index 3fbab378d5..cd8e06f624 100644
--- a/concourse/tasks/check-billing-comparison-with-cf.yml
+++ b/concourse/tasks/check-billing-comparison-with-cf.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/cf-acceptance-tests
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 inputs:
   - name: paas-billing
 params:
diff --git a/concourse/tasks/configure-grafana.yml b/concourse/tasks/configure-grafana.yml
index 2820298dea..50801042df 100644
--- a/concourse/tasks/configure-grafana.yml
+++ b/concourse/tasks/configure-grafana.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/ruby
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 inputs:
   - name: paas-trusted-people
 run:
diff --git a/concourse/tasks/create_admin.yml b/concourse/tasks/create_admin.yml
index ec33273073..f21a400c04 100644
--- a/concourse/tasks/create_admin.yml
+++ b/concourse/tasks/create_admin.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/cf-uaac
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 inputs:
   - name: paas-cf
   - name: cf-manifest
diff --git a/concourse/tasks/create_nonadmin.yml b/concourse/tasks/create_nonadmin.yml
index ae25a10a42..b212e098c0 100644
--- a/concourse/tasks/create_nonadmin.yml
+++ b/concourse/tasks/create_nonadmin.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/cf-cli
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 inputs:
   - name: paas-cf
 outputs:
diff --git a/concourse/tasks/cronitor-monitor-ping-action.yml b/concourse/tasks/cronitor-monitor-ping-action.yml
index 8d82b23c5e..91a33f23fb 100644
--- a/concourse/tasks/cronitor-monitor-ping-action.yml
+++ b/concourse/tasks/cronitor-monitor-ping-action.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/cf-acceptance-tests
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 run:
   path: sh
   args:
diff --git a/concourse/tasks/curl-az-healthcheck.yml b/concourse/tasks/curl-az-healthcheck.yml
index 1f374c1ceb..5bf13d2b8d 100644
--- a/concourse/tasks/curl-az-healthcheck.yml
+++ b/concourse/tasks/curl-az-healthcheck.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/curl-ssl
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 params:
   AVAILABILITY_ZONE:
   ENABLE_AZ_HEALTHCHECK:
diff --git a/concourse/tasks/custom-acceptance-tests-run.yml b/concourse/tasks/custom-acceptance-tests-run.yml
index e8964254e8..ee1a731a44 100644
--- a/concourse/tasks/custom-acceptance-tests-run.yml
+++ b/concourse/tasks/custom-acceptance-tests-run.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/cf-acceptance-tests
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 inputs:
   - name: paas-cf
   - name: test-config
diff --git a/concourse/tasks/custom-broker-acceptance-tests-run.yml b/concourse/tasks/custom-broker-acceptance-tests-run.yml
index b2297a0ed2..67ff72e428 100644
--- a/concourse/tasks/custom-broker-acceptance-tests-run.yml
+++ b/concourse/tasks/custom-broker-acceptance-tests-run.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/cf-acceptance-tests
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 inputs:
   - name: paas-cf
   - name: test-config
diff --git a/concourse/tasks/delete_user.yml b/concourse/tasks/delete_user.yml
index 9e1b8e2fda..7bc4a5ffb0 100644
--- a/concourse/tasks/delete_user.yml
+++ b/concourse/tasks/delete_user.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/cf-cli
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 inputs:
   - name: paas-cf
   - name: cf-manifest
diff --git a/concourse/tasks/forget-access-keys.yml b/concourse/tasks/forget-access-keys.yml
index cd83e925f9..7c0e92c1fe 100644
--- a/concourse/tasks/forget-access-keys.yml
+++ b/concourse/tasks/forget-access-keys.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/terraform
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 inputs:
   - name: paas-cf
   - name: cf-tfstate
diff --git a/concourse/tasks/generate-git-keys.yml b/concourse/tasks/generate-git-keys.yml
index 4256014fb0..c492636993 100644
--- a/concourse/tasks/generate-git-keys.yml
+++ b/concourse/tasks/generate-git-keys.yml
@@ -3,7 +3,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/bosh-cli-v2
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 run:
   path: sh
   args:
diff --git a/concourse/tasks/generate-test-config.yml b/concourse/tasks/generate-test-config.yml
index f2ba0862a4..e679500658 100644
--- a/concourse/tasks/generate-test-config.yml
+++ b/concourse/tasks/generate-test-config.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/bosh-cli-v2
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 inputs:
   - name: paas-cf
   - name: admin-creds
diff --git a/concourse/tasks/get-cf-cli-config.yml b/concourse/tasks/get-cf-cli-config.yml
index cea4fc7867..bd59ad91b7 100644
--- a/concourse/tasks/get-cf-cli-config.yml
+++ b/concourse/tasks/get-cf-cli-config.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/ruby
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 inputs:
   - name: paas-cf
   - name: cf-manifest
diff --git a/concourse/tasks/remove-db.yml b/concourse/tasks/remove-db.yml
index 6481742d7f..4383d37058 100644
--- a/concourse/tasks/remove-db.yml
+++ b/concourse/tasks/remove-db.yml
@@ -7,7 +7,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/cf-cli
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 run:
   path: sh
   args:
diff --git a/concourse/tasks/send-nagging-email-alert.yml b/concourse/tasks/send-nagging-email-alert.yml
index de687466c0..1684116a46 100644
--- a/concourse/tasks/send-nagging-email-alert.yml
+++ b/concourse/tasks/send-nagging-email-alert.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/awscli
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 inputs:
   - name: paas-cf
 params:
diff --git a/concourse/tasks/smoke-tests-run.yml b/concourse/tasks/smoke-tests-run.yml
index 4ce98cc132..dc81f29ae4 100644
--- a/concourse/tasks/smoke-tests-run.yml
+++ b/concourse/tasks/smoke-tests-run.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/cf-acceptance-tests
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 inputs:
   - name: paas-cf
   - name: cf-smoke-tests-release
diff --git a/concourse/tasks/tag-repo.yml b/concourse/tasks/tag-repo.yml
index 5a1127e8aa..37594ca937 100644
--- a/concourse/tasks/tag-repo.yml
+++ b/concourse/tasks/tag-repo.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/git-ssh
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 inputs:
   - name: git-repo
 params:
diff --git a/concourse/tasks/upload-test-artifacts.yml b/concourse/tasks/upload-test-artifacts.yml
index 188e2701f5..106f1f598e 100644
--- a/concourse/tasks/upload-test-artifacts.yml
+++ b/concourse/tasks/upload-test-artifacts.yml
@@ -4,7 +4,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/awscli
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 inputs:
   - name: paas-cf
   - name: artifacts
diff --git a/concourse/tasks/wait-for-api-availability-tests.yml b/concourse/tasks/wait-for-api-availability-tests.yml
index fcc1dd83c3..6885f1c732 100644
--- a/concourse/tasks/wait-for-api-availability-tests.yml
+++ b/concourse/tasks/wait-for-api-availability-tests.yml
@@ -11,7 +11,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/awscli
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 run:
   path: sh
   args:
diff --git a/concourse/tasks/wait-for-app-availability-tests.yml b/concourse/tasks/wait-for-app-availability-tests.yml
index 15fe240a76..ea51cfe035 100644
--- a/concourse/tasks/wait-for-app-availability-tests.yml
+++ b/concourse/tasks/wait-for-app-availability-tests.yml
@@ -13,7 +13,7 @@ image_resource:
   type: registry-image
   source:
     repository: ghcr.io/alphagov/paas/cf-cli
-    tag: acff07cc3f0d4f478f54a7dedd40d47c90ad62f7
+    tag: b5568301ae03da8220c5ea2f907088dfa38e963d
 run:
   path: sh
   args:

From f06de559e8fb4844546b141fff9d52ba1db6ca3c Mon Sep 17 00:00:00 2001
From: Ben Corlett <ben.corlett@digital.cabinet-office.gov.uk>
Date: Thu, 14 Sep 2023 10:31:34 +0100
Subject: [PATCH 3/4] New cf-acceptance tests require the error page to have a
 particular formatted string to work.

Adding the formatted string as a meta tag.
---
 .../cf-manifest/operations.d/310-router-custom-error-page.yml    | 1 +
 tools/error_page/src/layout.tsx                                  | 1 +
 2 files changed, 2 insertions(+)

diff --git a/manifests/cf-manifest/operations.d/310-router-custom-error-page.yml b/manifests/cf-manifest/operations.d/310-router-custom-error-page.yml
index 76c2c29d9a..ce337d0ab2 100644
--- a/manifests/cf-manifest/operations.d/310-router-custom-error-page.yml
+++ b/manifests/cf-manifest/operations.d/310-router-custom-error-page.yml
@@ -12,6 +12,7 @@
           <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
           <meta name="theme-color" content="#0b0c0c" />
           <meta httpEquiv="X-UA-Compatible" content="IE=edge" />
+          <meta name="for-acceptance-tests" content="{{ .Status }} {{ .StatusText }}" />
           <!--[if !IE 8]><!-->
             <style media="screen">.govuk-template{background-color:#f3f2f1;-webkit-text-size-adjust:100%;-moz-text-size-adjust:100%;-ms-text-size-adjust:100%;text-size-adjust:100%}@media screen{.govuk-template{overflow-y:scroll}}.govuk-template__body{margin:0;background-color:#fff}.govuk-link{font-family:"HelveticaNeue","Helvetica Neue","Arial","Helvetica",sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}@media print{.govuk-link{font-family:sans-serif}}.govuk-link:focus{outline:3px solid transparent;color:#0b0c0c;background-color:#fd0;box-shadow:0 -2px #fd0,0 4px #0b0c0c;text-decoration:none}.govuk-link:link{color:#1d70b8}.govuk-link:visited{color:#4c2c92}.govuk-link:hover{color:#003078}.govuk-link:active{color:#0b0c0c}.govuk-link:focus{color:#0b0c0c}@media print{.govuk-link[href^="/"]::after,.govuk-link[href^="http://"]::after,.govuk-link[href^="https://"]::after{content:" (" attr(href) ")";font-size:90%;word-wrap:break-word}}.govuk-link--muted:link,.govuk-link--muted:visited,.govuk-link--muted:hover,.govuk-link--muted:active{color:#505a5f}.govuk-link--muted:focus{color:#0b0c0c}.govuk-link--text-colour:link,.govuk-link--text-colour:visited,.govuk-link--text-colour:hover,.govuk-link--text-colour:active,.govuk-link--text-colour:focus{color:#0b0c0c}@media print{.govuk-link--text-colour:link,.govuk-link--text-colour:visited,.govuk-link--text-colour:hover,.govuk-link--text-colour:active,.govuk-link--text-colour:focus{color:#000}}.govuk-link--no-visited-state:link{color:#1d70b8}.govuk-link--no-visited-state:visited{color:#1d70b8}.govuk-link--no-visited-state:hover{color:#003078}.govuk-link--no-visited-state:active{color:#0b0c0c}.govuk-link--no-visited-state:focus{color:#0b0c0c}.govuk-heading-xl{color:#0b0c0c;font-family:"HelveticaNeue","Helvetica Neue","Arial","Helvetica",sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:32px;font-size:2rem;line-height:1.09375;display:block;margin-top:0;margin-bottom:30px}@media print{.govuk-heading-xl{color:#000}}@media print{.govuk-heading-xl{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-heading-xl{font-size:48px;font-size:3rem;line-height:1.04167}}@media print{.govuk-heading-xl{font-size:32pt;line-height:1.15}}@media (min-width: 40.0625em){.govuk-heading-xl{margin-bottom:50px}}.govuk-heading-l{color:#0b0c0c;font-family:"HelveticaNeue","Helvetica Neue","Arial","Helvetica",sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:24px;font-size:1.5rem;line-height:1.04167;display:block;margin-top:0;margin-bottom:20px}@media print{.govuk-heading-l{color:#000}}@media print{.govuk-heading-l{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-heading-l{font-size:36px;font-size:2.25rem;line-height:1.11111}}@media print{.govuk-heading-l{font-size:24pt;line-height:1.05}}@media (min-width: 40.0625em){.govuk-heading-l{margin-bottom:30px}}.govuk-heading-m{color:#0b0c0c;font-family:"HelveticaNeue","Helvetica Neue","Arial","Helvetica",sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:18px;font-size:1.125rem;line-height:1.11111;display:block;margin-top:0;margin-bottom:15px}@media print{.govuk-heading-m{color:#000}}@media print{.govuk-heading-m{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-heading-m{font-size:24px;font-size:1.5rem;line-height:1.25}}@media print{.govuk-heading-m{font-size:18pt;line-height:1.15}}@media (min-width: 40.0625em){.govuk-heading-m{margin-bottom:20px}}.govuk-heading-s{color:#0b0c0c;font-family:"HelveticaNeue","Helvetica Neue","Arial","Helvetica",sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:700;font-size:16px;font-size:1rem;line-height:1.25;display:block;margin-top:0;margin-bottom:15px}@media print{.govuk-heading-s{color:#000}}@media print{.govuk-heading-s{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-heading-s{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-heading-s{font-size:14pt;line-height:1.15}}@media (min-width: 40.0625em){.govuk-heading-s{margin-bottom:20px}}.govuk-caption-xl{font-family:"HelveticaNeue","Helvetica Neue","Arial","Helvetica",sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:18px;font-size:1.125rem;line-height:1.11111;display:block;margin-bottom:5px;color:#505a5f}@media print{.govuk-caption-xl{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-caption-xl{font-size:27px;font-size:1.6875rem;line-height:1.11111}}@media print{.govuk-caption-xl{font-size:18pt;line-height:1.15}}.govuk-caption-l{font-family:"HelveticaNeue","Helvetica Neue","Arial","Helvetica",sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:18px;font-size:1.125rem;line-height:1.11111;display:block;margin-bottom:5px;color:#505a5f}@media print{.govuk-caption-l{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-caption-l{font-size:24px;font-size:1.5rem;line-height:1.25}}@media print{.govuk-caption-l{font-size:18pt;line-height:1.15}}@media (min-width: 40.0625em){.govuk-caption-l{margin-bottom:0}}.govuk-caption-m{font-family:"HelveticaNeue","Helvetica Neue","Arial","Helvetica",sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;display:block;color:#505a5f}@media print{.govuk-caption-m{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-caption-m{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-caption-m{font-size:14pt;line-height:1.15}}.govuk-body-l,.govuk-body-lead{color:#0b0c0c;font-family:"HelveticaNeue","Helvetica Neue","Arial","Helvetica",sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:18px;font-size:1.125rem;line-height:1.11111;margin-top:0;margin-bottom:20px}@media print{.govuk-body-l,.govuk-body-lead{color:#000}}@media print{.govuk-body-l,.govuk-body-lead{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-body-l,.govuk-body-lead{font-size:24px;font-size:1.5rem;line-height:1.25}}@media print{.govuk-body-l,.govuk-body-lead{font-size:18pt;line-height:1.15}}@media (min-width: 40.0625em){.govuk-body-l,.govuk-body-lead{margin-bottom:30px}}.govuk-body-m,.govuk-body{color:#0b0c0c;font-family:"HelveticaNeue","Helvetica Neue","Arial","Helvetica",sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:16px;font-size:1rem;line-height:1.25;margin-top:0;margin-bottom:15px}@media print{.govuk-body-m,.govuk-body{color:#000}}@media print{.govuk-body-m,.govuk-body{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-body-m,.govuk-body{font-size:19px;font-size:1.1875rem;line-height:1.31579}}@media print{.govuk-body-m,.govuk-body{font-size:14pt;line-height:1.15}}@media (min-width: 40.0625em){.govuk-body-m,.govuk-body{margin-bottom:20px}}.govuk-body-s{color:#0b0c0c;font-family:"HelveticaNeue","Helvetica Neue","Arial","Helvetica",sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:14px;font-size:.875rem;line-height:1.14286;margin-top:0;margin-bottom:15px}@media print{.govuk-body-s{color:#000}}@media print{.govuk-body-s{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-body-s{font-size:16px;font-size:1rem;line-height:1.25}}@media print{.govuk-body-s{font-size:14pt;line-height:1.2}}@media (min-width: 40.0625em){.govuk-body-s{margin-bottom:20px}}.govuk-body-xs{color:#0b0c0c;font-family:"HelveticaNeue","Helvetica Neue","Arial","Helvetica",sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-weight:400;font-size:12px;font-size:.75rem;line-height:1.25;margin-top:0;margin-bottom:15px}@media print{.govuk-body-xs{color:#000}}@media print{.govuk-body-xs{font-family:sans-serif}}@media (min-width: 40.0625em){.govuk-body-xs{font-size:14px;font-size:.875rem;line-height:1.42857}}@media print{.govuk-body-xs{font-size:12pt;line-height:1.2}}@media (min-width: 40.0625em){.govuk-body-xs{margin-bottom:20px}}.govuk-body-l+.govuk-heading-l,.govuk-body-lead+.govuk-heading-l{padding-top:5px}@media (min-width: 40.0625em){.govuk-body-l+.govuk-heading-l,.govuk-body-lead+.govuk-heading-l{padding-top:10px}}.govuk-body-m+.govuk-heading-l,.govuk-body+.govuk-heading-l,.govuk-body-s+.govuk-heading-l{padding-top:15px}@media (min-width: 40.0625em){.govuk-body-m+.govuk-heading-l,.govuk-body+.govuk-heading-l,.govuk-body-s+.govuk-heading-l{padding-top:20px}}.govuk-body-m+.govuk-heading-m,.govuk-body+.govuk-heading-m,.govuk-body-s+.govuk-heading-m,.govuk-body-m+.govuk-heading-s,.govuk-body+.govuk-heading-s,.govuk-body-s+.govuk-heading-s{padding-top:5px}@media (min-width: 40.0625em){.govuk-body-m+.govuk-heading-m,.govuk-body+.govuk-heading-m,.govuk-body-s+.govuk-heading-m,.govuk-body-m+.govuk-heading-s,.govuk-body+.govuk-heading-s,.govuk-body-s+.govuk-heading-s{padding-top:10px}}.govuk-grid-row{margin-right:-15px;margin-left:-15px}.govuk-grid-row:after{content:"";display:block;clear:both}.govuk-grid-column-one-quarter{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width: 40.0625em){.govuk-grid-column-one-quarter{width:25%;float:left}}.govuk-grid-column-one-third{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width: 40.0625em){.govuk-grid-column-one-third{width:33.3333%;float:left}}.govuk-grid-column-one-half{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width: 40.0625em){.govuk-grid-column-one-half{width:50%;float:left}}.govuk-grid-column-two-thirds{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width: 40.0625em){.govuk-grid-column-two-thirds{width:66.6666%;float:left}}.govuk-grid-column-three-quarters{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width: 40.0625em){.govuk-grid-column-three-quarters{width:75%;float:left}}.govuk-grid-column-full{box-sizing:border-box;width:100%;padding:0 15px}@media (min-width: 40.0625em){.govuk-grid-column-full{width:100%;float:left}}.govuk-grid-column-one-quarter-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width: 48.0625em){.govuk-grid-column-one-quarter-from-desktop{width:25%;float:left}}.govuk-grid-column-one-third-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width: 48.0625em){.govuk-grid-column-one-third-from-desktop{width:33.3333%;float:left}}.govuk-grid-column-one-half-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width: 48.0625em){.govuk-grid-column-one-half-from-desktop{width:50%;float:left}}.govuk-grid-column-two-thirds-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width: 48.0625em){.govuk-grid-column-two-thirds-from-desktop{width:66.6666%;float:left}}.govuk-grid-column-three-quarters-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width: 48.0625em){.govuk-grid-column-three-quarters-from-desktop{width:75%;float:left}}.govuk-grid-column-full-from-desktop{box-sizing:border-box;padding:0 15px}@media (min-width: 48.0625em){.govuk-grid-column-full-from-desktop{width:100%;float:left}}.govuk-main-wrapper{display:block;padding-top:20px;padding-bottom:20px}@media (min-width: 40.0625em){.govuk-main-wrapper{padding-top:40px;padding-bottom:40px}}.govuk-main-wrapper--auto-spacing:first-child,.govuk-main-wrapper--l{padding-top:30px}@media (min-width: 40.0625em){.govuk-main-wrapper--auto-spacing:first-child,.govuk-main-wrapper--l{padding-top:50px}}.govuk-width-container{max-width:960px;margin-right:15px;margin-left:15px}@supports (margin: max(calc(0px))){.govuk-width-container{margin-right:max(15px, calc(15px + env(safe-area-inset-right)));margin-left:max(15px, calc(15px + env(safe-area-inset-left)))}}@media (min-width: 40.0625em){.govuk-width-container{margin-right:30px;margin-left:30px}@supports (margin: max(calc(0px))){.govuk-width-container{margin-right:max(30px, calc(15px + env(safe-area-inset-right)));margin-left:max(30px, calc(15px + env(safe-area-inset-left)))}}}@media (min-width: 1020px){.govuk-width-container{margin-right:auto;margin-left:auto}@supports (margin: max(calc(0px))){.govuk-width-container{margin-right:auto;margin-left:auto}}}.govuk-skip-link{position:absolute !important;width:1px !important;height:1px !important;margin:0 !important;overflow:hidden !important;clip:rect(0 0 0 0) !important;-webkit-clip-path:inset(50%) !important;clip-path:inset(50%) !important;white-space:nowrap !important;font-family:"HelveticaNeue","Helvetica Neue","Arial","Helvetica",sans-serif;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;font-size:14px;font-size:.875rem;line-height:1.14286;display:block;padding:10px 15px}.govuk-skip-link:active,.govuk-skip-link:focus{position:static !important;width:auto !important;height:auto !important;margin:inherit !important;overflow:visible !important;clip:auto !important;-webkit-clip-path:none !important;clip-path:none !important;white-space:inherit !important}@media print{.govuk-skip-link{font-family:sans-serif}}.govuk-skip-link:link,.govuk-skip-link:visited,.govuk-skip-link:hover,.govuk-skip-link:active,.govuk-skip-link:focus{color:#0b0c0c}@media print{.govuk-skip-link:link,.govuk-skip-link:visited,.govuk-skip-link:hover,.govuk-skip-link:active,.govuk-skip-link:focus{color:#000}}@media (min-width: 40.0625em){.govuk-skip-link{font-size:16px;font-size:1rem;line-height:1.25}}@media print{.govuk-skip-link{font-size:14pt;line-height:1.2}}@supports (padding: max(calc(0px))){.govuk-skip-link{padding-right:max(15px, calc(15px + env(safe-area-inset-right)));padding-left:max(15px, calc(15px + env(safe-area-inset-left)))}}.govuk-skip-link:focus{outline:3px solid #fd0;outline-offset:0;background-color:#fd0}
     </style>
diff --git a/tools/error_page/src/layout.tsx b/tools/error_page/src/layout.tsx
index 8da46c260c..bbd53cc0d0 100644
--- a/tools/error_page/src/layout.tsx
+++ b/tools/error_page/src/layout.tsx
@@ -42,6 +42,7 @@ export async function render(content: ReactElement, config: renderConfig): Promi
       <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
       <meta name="theme-color" content="${cfg.themeColor}" />
       <meta httpEquiv="X-UA-Compatible" content="IE=edge" />
+      <meta name="for-acceptance-tests" content="{{ .Status }} {{ .StatusText }}" />
       <!--[if !IE 8]><!-->
         <style media="screen">${cssScreen.css}</style>
         <style media="print">${cssPrint.css}</style>

From 5cee5f1ea18ff230b56a80b7f9993d220f897323 Mon Sep 17 00:00:00 2001
From: Ben Corlett <ben.corlett@digital.cabinet-office.gov.uk>
Date: Thu, 14 Sep 2023 14:43:42 +0100
Subject: [PATCH 4/4] Bump jammy stemcell to 1.222

---
 .../app-autoscaler/operations.d/020-bosh-set-stemcells.yml      | 2 +-
 manifests/cf-manifest/operations.d/020-bosh-set-stemcells.yml   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifests/app-autoscaler/operations.d/020-bosh-set-stemcells.yml b/manifests/app-autoscaler/operations.d/020-bosh-set-stemcells.yml
index 3ae384770b..2f574d3bf2 100644
--- a/manifests/app-autoscaler/operations.d/020-bosh-set-stemcells.yml
+++ b/manifests/app-autoscaler/operations.d/020-bosh-set-stemcells.yml
@@ -4,4 +4,4 @@
   value:
     - alias: default
       os: ubuntu-jammy
-      version: "1.199"
+      version: "1.222"
diff --git a/manifests/cf-manifest/operations.d/020-bosh-set-stemcells.yml b/manifests/cf-manifest/operations.d/020-bosh-set-stemcells.yml
index 3ae384770b..2f574d3bf2 100644
--- a/manifests/cf-manifest/operations.d/020-bosh-set-stemcells.yml
+++ b/manifests/cf-manifest/operations.d/020-bosh-set-stemcells.yml
@@ -4,4 +4,4 @@
   value:
     - alias: default
       os: ubuntu-jammy
-      version: "1.199"
+      version: "1.222"