From 3e28db01da2b016361287dbf82ebaf6027fd47aa Mon Sep 17 00:00:00 2001 From: Ned Petrov Date: Sun, 14 Jun 2026 10:48:18 +0300 Subject: [PATCH] refactor: align jammy agent settings to cp+assets approach Replace heredoc-based apply.sh scripts with static assets/agent.json files (the same approach already used on ubuntu-noble). This makes the two branches structurally identical so future jammy=>noble merge forwards cannot silently resolve apply.sh conflicts in favour of the wrong version. - Delete prelude_agent.bash (PartitionerType: parted is now inlined as a static field in each assets/agent.json, as the function has unconditionally returned that string since 59a9c29c7 in 2019) - Replace all 8 bosh_*_agent_settings/apply.sh heredocs with a single cp $assets_dir/agent.json line - Add assets/agent.json for every stage carrying the full config (including UseMonitIptablesFirewall added in 8104abdd1) --- stemcell_builder/lib/prelude_agent.bash | 4 -- .../bosh_alicloud_agent_settings/apply.sh | 30 +----------- .../assets/agent.json | 25 ++++++++++ .../stages/bosh_aws_agent_settings/apply.sh | 32 +------------ .../bosh_aws_agent_settings/assets/agent.json | 27 +++++++++++ .../stages/bosh_azure_agent_settings/apply.sh | 28 +---------- .../assets/agent.json | 23 ++++++++++ .../bosh_cloudstack_agent_settings/apply.sh | 32 +------------ .../assets/agent.json | 25 ++++++++++ .../bosh_google_agent_settings/apply.sh | 33 +------------ .../assets/agent.json | 27 +++++++++++ .../bosh_openstack_agent_settings/apply.sh | 46 +------------------ .../assets/agent.json | 38 +++++++++++++++ .../bosh_softlayer_agent_settings/apply.sh | 31 +------------ .../assets/agent.json | 24 ++++++++++ .../bosh_vsphere_agent_settings/apply.sh | 26 +---------- .../assets/agent.json | 22 +++++++++ 17 files changed, 227 insertions(+), 246 deletions(-) delete mode 100644 stemcell_builder/lib/prelude_agent.bash create mode 100644 stemcell_builder/stages/bosh_alicloud_agent_settings/assets/agent.json create mode 100644 stemcell_builder/stages/bosh_aws_agent_settings/assets/agent.json create mode 100644 stemcell_builder/stages/bosh_azure_agent_settings/assets/agent.json create mode 100644 stemcell_builder/stages/bosh_cloudstack_agent_settings/assets/agent.json create mode 100644 stemcell_builder/stages/bosh_google_agent_settings/assets/agent.json create mode 100644 stemcell_builder/stages/bosh_openstack_agent_settings/assets/agent.json create mode 100644 stemcell_builder/stages/bosh_softlayer_agent_settings/assets/agent.json create mode 100644 stemcell_builder/stages/bosh_vsphere_agent_settings/assets/agent.json diff --git a/stemcell_builder/lib/prelude_agent.bash b/stemcell_builder/lib/prelude_agent.bash deleted file mode 100644 index 522b143274..0000000000 --- a/stemcell_builder/lib/prelude_agent.bash +++ /dev/null @@ -1,4 +0,0 @@ - -function get_partitioner_type_mapping { - echo '"PartitionerType": "parted",' -} diff --git a/stemcell_builder/stages/bosh_alicloud_agent_settings/apply.sh b/stemcell_builder/stages/bosh_alicloud_agent_settings/apply.sh index 2e46aab94d..50c735abb0 100755 --- a/stemcell_builder/stages/bosh_alicloud_agent_settings/apply.sh +++ b/stemcell_builder/stages/bosh_alicloud_agent_settings/apply.sh @@ -2,32 +2,6 @@ base_dir=$(readlink -nf $(dirname $0)/../..) source $base_dir/lib/prelude_apply.bash -source $base_dir/lib/prelude_agent.bash -cat > $chroot/var/vcap/bosh/agent.json < $chroot/var/vcap/bosh/agent.json < $chroot/var/vcap/bosh/agent.json < $agent_settings_file < $chroot/var/vcap/bosh/agent.json < $agent_settings_file < $chroot/var/vcap/bosh/agent.json < $chroot/var/vcap/bosh/agent.json <