Merge pull request #3359 from alphagov/ris-cf-deployment-v32.1.0

cf-deployment: 30.5.0 -> 32.1.0

concourse/pipelines/create-cloudfoundry.yml

@@ -543,13 +543,13 @@ resources:
     type: git
     source:
       uri: https://github.com/cloudfoundry/cf-acceptance-tests
-      branch: cf30.5
+      branch: cf32.1
 
   - name: cf-smoke-tests-release
     type: git
     source:
       uri: https://github.com/cloudfoundry/cf-smoke-tests-release
-      tag_filter: "42.0.76"
+      tag_filter: "42.0.88"
       submodules:
       - "src/smoke_tests"
 

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.76"
+    tag_filter: "42.0.88"
     submodules:
       - "src/smoke_tests"
 

manifests/app-autoscaler/operations.d/020-bosh-set-stemcells.yml

@@ -4,4 +4,4 @@
   value:
     - alias: default
       os: ubuntu-jammy
-      version: "1.125"
+      version: "1.199"

manifests/cf-manifest/operations.d/010-set-cflinuxfs3-default-stack.yml

@@ -0,0 +1,7 @@
+---
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/default_stack?
+  value: cflinuxfs3
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/diego/docker_staging_stack
+  value: cflinuxfs3

manifests/cf-manifest/operations.d/011-use-cflinuxfs3.yml

@@ -0,0 +1,105 @@
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/diego/droplet_destinations/cflinuxfs3?
+  value: /home/vcap
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/diego/lifecycle_bundles/buildpack~1cflinuxfs3?
+  value: buildpack_app_lifecycle/buildpack_app_lifecycle.tgz
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/stacks/name=cflinuxfs4:before
+  value:
+    description: Cloud Foundry Linux-based filesystem (Ubuntu 18.04)
+    name: cflinuxfs3
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/install_buildpacks/0:before
+  value:
+    name: staticfile_buildpack
+    package: staticfile-buildpack-cflinuxfs3
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/install_buildpacks/0:after
+  value:
+    name: java_buildpack
+    package: java-buildpack-cflinuxfs3
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/install_buildpacks/1:after
+  value:
+    name: ruby_buildpack
+    package: ruby-buildpack-cflinuxfs3
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/install_buildpacks/2:after
+  value:
+    name: dotnet_core_buildpack
+    package: dotnet-core-buildpack-cflinuxfs3
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/install_buildpacks/3:after
+  value:
+    name: nodejs_buildpack
+    package: nodejs-buildpack-cflinuxfs3
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/install_buildpacks/4:after
+  value:
+    name: go_buildpack
+    package: go-buildpack-cflinuxfs3
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/install_buildpacks/5:after
+  value:
+    name: python_buildpack
+    package: python-buildpack-cflinuxfs3
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/install_buildpacks/6:after
+  value:
+    name: php_buildpack
+    package: php-buildpack-cflinuxfs3
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/install_buildpacks/7:after
+  value:
+    name: nginx_buildpack
+    package: nginx-buildpack-cflinuxfs3
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/install_buildpacks/8:after
+  value:
+    name: r_buildpack
+    package: r-buildpack-cflinuxfs3
+- type: replace
+  path: /instance_groups/name=api/jobs/name=cloud_controller_ng/properties/cc/install_buildpacks/9:after
+  value:
+    name: binary_buildpack
+    package: binary-buildpack-cflinuxfs3
+- type: replace
+  path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/diego/droplet_destinations/cflinuxfs3?
+  value: /home/vcap
+- type: replace
+  path: /instance_groups/name=cc-worker/jobs/name=cloud_controller_worker/properties/cc/diego/lifecycle_bundles/buildpack~1cflinuxfs3?
+  value: buildpack_app_lifecycle/buildpack_app_lifecycle.tgz
+- type: replace
+  path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/cc/diego/droplet_destinations/cflinuxfs3?
+  value: /home/vcap
+- type: replace
+  path: /instance_groups/name=scheduler/jobs/name=cloud_controller_clock/properties/cc/diego/lifecycle_bundles/buildpack~1cflinuxfs3?
+  value: buildpack_app_lifecycle/buildpack_app_lifecycle.tgz
+- type: replace
+  path: /instance_groups/name=scheduler/jobs/name=cc_deployment_updater/properties/cc/diego/droplet_destinations/cflinuxfs3?
+  value: /home/vcap
+- type: replace
+  path: /instance_groups/name=scheduler/jobs/name=cc_deployment_updater/properties/cc/diego/lifecycle_bundles/buildpack~1cflinuxfs3?
+  value: buildpack_app_lifecycle/buildpack_app_lifecycle.tgz
+- type: replace
+  path: /instance_groups/name=diego-cell/jobs/name=cflinuxfs3-rootfs-setup?
+  value:
+    name: cflinuxfs3-rootfs-setup
+    properties:
+      cflinuxfs3-rootfs:
+        trusted_certs:
+        - ((diego_instance_identity_ca.ca))
+        - ((credhub_tls.ca))
+        - ((uaa_ssl.ca))
+    release: cflinuxfs3
+- type: replace
+  path: /instance_groups/name=diego-cell/jobs/name=rep/properties/diego/rep/preloaded_rootfses/0:before
+  value: cflinuxfs3:/var/vcap/packages/cflinuxfs3/rootfs.tar
+- type: replace
+  path: /releases/name=cflinuxfs4:before
+  value:
+    name: cflinuxfs3
+    sha1: f9dcec3bec0f0d1598231c6ade2191eedcf33520
+    url: https://bosh.io/d/github.com/cloudfoundry/cflinuxfs3-release?v=0.367.0
+    version: 0.367.0

manifests/cf-manifest/operations.d/020-bosh-set-stemcells.yml

@@ -4,4 +4,4 @@
   value:
     - alias: default
       os: ubuntu-jammy
-      version: "1.125"
+      version: "1.199"

manifests/cf-manifest/operations.d/320-cc-release.yml

@@ -3,6 +3,6 @@
   path: /releases/name=capi
   value:
     name: "capi"
-    version: "1.153.0"
-    url: "https://bosh.io/d/github.com/cloudfoundry/capi-release?v=1.153.0"
-    sha1: "4dcf5724368372022e427d0f7d5dce17f5990686"
+    version: "1.157.0"
+    url: "https://bosh.io/d/github.com/cloudfoundry/capi-release?v=1.157.0"
+    sha1: "2b26a1fbc8593cb8b1465e1d3a32c0f9cd3ace1e"

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.14.0"
+    tested_uaa_version = "76.18.0"
     manifest_releases = get_manifest_releases
 
     expect(manifest_releases).to have_key("uaa"), "expected release for uaa to be found in manifest"
@@ -118,7 +118,7 @@ def get_manifest_releases
     expect(monitor_remote_smoke_tests_resource_version).to eq(cf_smoke_tests_resource_version)
   end
 
-  pinned_cf_acceptance_tests_version = "30.5"
+  pinned_cf_acceptance_tests_version = nil
   specify "cf-acceptance-tests version should be the same as the CF manifest version" do
     cf_manifest_version = cf_deployment_manifest
       .fetch("manifest_version")