From 13e06cec10fb4d94a4a301b01ed0b47d02e88d8c Mon Sep 17 00:00:00 2001 From: Katharina Przybill <30441792+kathap@users.noreply.github.com> Date: Mon, 26 Jan 2026 19:10:17 +0100 Subject: [PATCH 1/2] Add storage_cli_optional_flags to blobstore benchmarks --- jobs/blobstore_benchmark/spec | 2 ++ jobs/blobstore_benchmark/templates/cloud_controller_ng.yml.erb | 3 +++ 2 files changed, 5 insertions(+) diff --git a/jobs/blobstore_benchmark/spec b/jobs/blobstore_benchmark/spec index 97a8a6a304..79437d2885 100644 --- a/jobs/blobstore_benchmark/spec +++ b/jobs/blobstore_benchmark/spec @@ -51,3 +51,5 @@ properties: cc.stdout_logging_enabled: default: false description: "Enable logging to stdout" + cc.storage_cli_optional_flags: + description: "Storage Cli extra flags string" \ No newline at end of file diff --git a/jobs/blobstore_benchmark/templates/cloud_controller_ng.yml.erb b/jobs/blobstore_benchmark/templates/cloud_controller_ng.yml.erb index dad91f0f43..55cf135137 100644 --- a/jobs/blobstore_benchmark/templates/cloud_controller_ng.yml.erb +++ b/jobs/blobstore_benchmark/templates/cloud_controller_ng.yml.erb @@ -125,6 +125,9 @@ 'storage_cli_config_file_packages' => '/var/vcap/jobs/blobstore_benchmark/config/storage_cli_config_packages.json', 'storage_cli_config_file_droplets' => '/var/vcap/jobs/blobstore_benchmark/config/storage_cli_config_droplets.json', ) + link("cloud_controller_internal").if_p("cc.storage_cli_optional_flags") do |flags| + final["storage_cli_optional_flags"] = flags + end end deep_merge_without_overwrite(final, cc_cfg) From 67d7d61344d21df5767ec9254dc640741e814c5c Mon Sep 17 00:00:00 2001 From: Katharina Przybill <30441792+kathap@users.noreply.github.com> Date: Mon, 26 Jan 2026 22:13:44 +0100 Subject: [PATCH 2/2] Use empty string as fallback if storage_cli_optional_flags is not set isntead of nil --- .../templates/cloud_controller_ng.yml.erb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/jobs/blobstore_benchmark/templates/cloud_controller_ng.yml.erb b/jobs/blobstore_benchmark/templates/cloud_controller_ng.yml.erb index 55cf135137..789ccfae23 100644 --- a/jobs/blobstore_benchmark/templates/cloud_controller_ng.yml.erb +++ b/jobs/blobstore_benchmark/templates/cloud_controller_ng.yml.erb @@ -52,6 +52,10 @@ cc_cfg = deep_merge_overwrite(cc_cfg, overrides) + if cc_cfg.key?("storage_cli_optional_flags") + cc_cfg["storage_cli_optional_flags"] = cc_cfg["storage_cli_optional_flags"].to_s + end + %w[resource_pool buildpacks packages droplets].each do |k| section = cc_cfg[k] next unless section.is_a?(Hash) @@ -125,9 +129,6 @@ 'storage_cli_config_file_packages' => '/var/vcap/jobs/blobstore_benchmark/config/storage_cli_config_packages.json', 'storage_cli_config_file_droplets' => '/var/vcap/jobs/blobstore_benchmark/config/storage_cli_config_droplets.json', ) - link("cloud_controller_internal").if_p("cc.storage_cli_optional_flags") do |flags| - final["storage_cli_optional_flags"] = flags - end end deep_merge_without_overwrite(final, cc_cfg)