From 88fe4dbff904d8429f2a4d832cd1c4f19b27c2d3 Mon Sep 17 00:00:00 2001
From: Katharina Przybill <30441792+kathap@users.noreply.github.com>
Date: Fri, 3 Jul 2026 17:21:56 +0200
Subject: [PATCH] Remove fog-google related usage

---
 ...ure-blobstore-benchmark-fog-errand-gcs.yml | 58 -------------------
 ci/pipeline.yml                               |  3 -
 2 files changed, 61 deletions(-)
 delete mode 100644 cf-deployment-operations/configure-blobstore-benchmark-fog-errand-gcs.yml

diff --git a/cf-deployment-operations/configure-blobstore-benchmark-fog-errand-gcs.yml b/cf-deployment-operations/configure-blobstore-benchmark-fog-errand-gcs.yml
deleted file mode 100644
index 613c3af2..00000000
--- a/cf-deployment-operations/configure-blobstore-benchmark-fog-errand-gcs.yml
+++ /dev/null
@@ -1,58 +0,0 @@
-# Adds blobstore benchmark fog errand for gcs with per-mode overrides
-
-- type: replace
-  path: /instance_groups/-
-  value:
-    name: blobstore-benchmark-fog
-    instances: 1
-    azs: [z1]
-    networks:
-      - name: default
-    vm_type: default
-    stemcell: default
-    lifecycle: errand
-    jobs:
-      - name: blobstore_benchmark
-        release: capi
-        properties:
-          blobstore_benchmark:
-            mode: fog
-            cc_overrides:
-              db_logging_level: error
-              logging_level: error
-              log_db_queries: false
-              db:
-                log_level: error
-                log_db_queries: false
-              buildpacks:
-                blobstore_type: fog
-                fog_connection:
-                  provider: Google
-                  bucket_name: ((buildpack_directory_key))
-                  google_project: ((gcs_project))
-                  google_client_email: ((gcs_service_account_email))
-                  google_json_key_string: ((gcs_service_account_json_key))
-              droplets:
-                blobstore_type: fog
-                fog_connection:
-                  provider: Google
-                  bucket_name: ((droplet_directory_key))
-                  google_project: ((gcs_project))
-                  google_client_email: ((gcs_service_account_email))
-                  google_json_key_string: ((gcs_service_account_json_key))
-              packages:
-                blobstore_type: fog
-                fog_connection:
-                  provider: Google
-                  bucket_name: ((app_package_directory_key))
-                  google_project: ((gcs_project))
-                  google_client_email: ((gcs_service_account_email))
-                  google_json_key_string: ((gcs_service_account_json_key))
-              resource_pool:
-                blobstore_type: fog
-                fog_connection:
-                  provider: Google
-                  bucket_name: ((resource_directory_key))
-                  google_project: ((gcs_project))
-                  google_client_email: ((gcs_service_account_email))
-                  google_json_key_string: ((gcs_service_account_json_key))
diff --git a/ci/pipeline.yml b/ci/pipeline.yml
index bd338747..23c0675e 100644
--- a/ci/pipeline.yml
+++ b/ci/pipeline.yml
@@ -819,7 +819,6 @@ jobs:
             cf-deployment-operations/disable-skip-cert-verify.yml
             cf-deployment-operations/disable-skip-cert-verify-iso-seg.yml
             cf-deployment-operations/tag-bbl-env.yml
-            cf-deployment-operations/configure-blobstore-benchmark-fog-errand-gcs.yml
             cf-deployment-operations/configure-blobstore-benchmark-storage-cli-errand.yml
             cf-deployment-operations/add-loggregator-tls-cert.yml
             cf-deployment-operations/speed-up-diego-sync.yml
@@ -854,7 +853,6 @@ jobs:
             disable-skip-cert-verify.yml
             disable-skip-cert-verify-iso-seg.yml
             tag-bbl-env.yml
-            configure-blobstore-benchmark-fog-errand-gcs.yml
             configure-blobstore-benchmark-storage-cli-errand.yml
             add-loggregator-tls-cert.yml
             speed-up-diego-sync.yml
@@ -1960,7 +1958,6 @@ jobs:
         params:
           BBL_STATE_DIR: elsa-ha/bbl-state
           BOSH_DEPLOYMENT_NAME: cf
-          ERRAND_FOG: blobstore-benchmark-fog
           ERRAND_STORAGE_CLI: blobstore-benchmark-storage-cli
     ensure:
       do: