From e877bd7e6a638d3ff7bdb5d68049ddd316da7e98 Mon Sep 17 00:00:00 2001 From: D068328 Date: Fri, 31 Jul 2026 14:52:03 +0200 Subject: [PATCH] feat: move cleanup after hardening, to have more extensibility --- .../lib/bosh/stemcell/stage_collection.rb | 18 ++++++++--------- .../bosh/stemcell/stage_collection_spec.rb | 20 +++++++++---------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/bosh-stemcell/lib/bosh/stemcell/stage_collection.rb b/bosh-stemcell/lib/bosh/stemcell/stage_collection.rb index 0330eda35d..50e1fef19c 100644 --- a/bosh-stemcell/lib/bosh/stemcell/stage_collection.rb +++ b/bosh-stemcell/lib/bosh/stemcell/stage_collection.rb @@ -101,8 +101,8 @@ def openstack_stages system_openstack_clock system_openstack_modules system_parameters - bosh_clean bosh_harden + bosh_clean bosh_openstack_agent_settings bosh_clean_ssh restore_apt_sources @@ -120,8 +120,8 @@ def cloudstack_stages system_ubuntu_xen_tools system_parameters system_vhd_utils_tools - bosh_clean bosh_harden + bosh_clean bosh_cloudstack_agent_settings bosh_clean_ssh restore_apt_sources @@ -137,8 +137,8 @@ def vsphere_vcloud_stages :system_open_vm_tools, :system_vsphere_cdrom, :system_parameters, - :bosh_clean, :bosh_harden, + :bosh_clean, :bosh_enable_password_authentication, :bosh_vsphere_agent_settings, :bosh_clean_ssh, @@ -157,8 +157,8 @@ def aws_stages :system_network, :system_aws_modules, :system_parameters, - :bosh_clean, :bosh_harden, + :bosh_clean, :bosh_aws_agent_settings, :bosh_clean_ssh, :udev_aws_rules, @@ -177,8 +177,8 @@ def alicloud_stages system_network system_alicloud system_parameters - bosh_clean bosh_harden + bosh_clean bosh_alicloud_agent_settings bosh_clean_ssh restore_apt_sources @@ -194,8 +194,8 @@ def google_stages :system_google_modules, :system_google_packages, :system_parameters, - :bosh_clean, :bosh_harden, + :bosh_clean, :bosh_google_agent_settings, :bosh_clean_ssh, :restore_apt_sources, @@ -212,8 +212,8 @@ def warden_stages [ :system_parameters, :base_warden, - :bosh_clean, :bosh_harden, + :bosh_clean, :bosh_clean_ssh, :restore_apt_sources, # when adding a stage that changes files in the image, do so before @@ -232,8 +232,8 @@ def azure_stages :system_parameters, :enable_udf_module, :bosh_azure_chrony, - :bosh_clean, :bosh_harden, + :bosh_clean, :bosh_azure_agent_settings, :bosh_clean_ssh, :restore_apt_sources, @@ -253,8 +253,8 @@ def softlayer_stages :system_softlayer_multipath_tools, :system_softlayer_netplan, :system_parameters, - :bosh_clean, :bosh_harden, + :bosh_clean, :bosh_enable_password_authentication, :bosh_softlayer_agent_settings, :bosh_config_root_ssh_login, diff --git a/bosh-stemcell/spec/bosh/stemcell/stage_collection_spec.rb b/bosh-stemcell/spec/bosh/stemcell/stage_collection_spec.rb index 2375e003e9..a247da7dc1 100644 --- a/bosh-stemcell/spec/bosh/stemcell/stage_collection_spec.rb +++ b/bosh-stemcell/spec/bosh/stemcell/stage_collection_spec.rb @@ -87,8 +87,8 @@ module Bosh::Stemcell :system_network, :system_aws_modules, :system_parameters, - :bosh_clean, :bosh_harden, + :bosh_clean, :bosh_aws_agent_settings, :bosh_clean_ssh, :udev_aws_rules, @@ -120,8 +120,8 @@ module Bosh::Stemcell :system_network, :system_alicloud, :system_parameters, - :bosh_clean, :bosh_harden, + :bosh_clean, :bosh_alicloud_agent_settings, :bosh_clean_ssh, :restore_apt_sources, @@ -154,8 +154,8 @@ module Bosh::Stemcell :system_google_modules, :system_google_packages, :system_parameters, - :bosh_clean, :bosh_harden, + :bosh_clean, :bosh_google_agent_settings, :bosh_clean_ssh, :restore_apt_sources, @@ -191,8 +191,8 @@ module Bosh::Stemcell :system_openstack_clock, :system_openstack_modules, :system_parameters, - :bosh_clean, :bosh_harden, + :bosh_clean, :bosh_openstack_agent_settings, :bosh_clean_ssh, :restore_apt_sources, @@ -223,8 +223,8 @@ module Bosh::Stemcell :system_ubuntu_xen_tools, :system_parameters, :system_vhd_utils_tools, - :bosh_clean, :bosh_harden, + :bosh_clean, :bosh_cloudstack_agent_settings, :bosh_clean_ssh, :restore_apt_sources, @@ -253,8 +253,8 @@ module Bosh::Stemcell :system_open_vm_tools, :system_vsphere_cdrom, :system_parameters, - :bosh_clean, :bosh_harden, + :bosh_clean, :bosh_enable_password_authentication, :bosh_vsphere_agent_settings, :bosh_clean_ssh, @@ -282,8 +282,8 @@ module Bosh::Stemcell :system_open_vm_tools, :system_vsphere_cdrom, :system_parameters, - :bosh_clean, :bosh_harden, + :bosh_clean, :bosh_enable_password_authentication, :bosh_vsphere_agent_settings, :bosh_clean_ssh, @@ -309,8 +309,8 @@ module Bosh::Stemcell :system_parameters, :enable_udf_module, :bosh_azure_chrony, - :bosh_clean, :bosh_harden, + :bosh_clean, :bosh_azure_agent_settings, :bosh_clean_ssh, :restore_apt_sources, @@ -348,8 +348,8 @@ module Bosh::Stemcell :system_softlayer_multipath_tools, :system_softlayer_netplan, :system_parameters, - :bosh_clean, :bosh_harden, + :bosh_clean, :bosh_enable_password_authentication, :bosh_softlayer_agent_settings, :bosh_config_root_ssh_login, @@ -371,8 +371,8 @@ module Bosh::Stemcell [ :system_parameters, :base_warden, - :bosh_clean, :bosh_harden, + :bosh_clean, :bosh_clean_ssh, :restore_apt_sources, :image_create,