foreman_maintain 1.4.4 → 1.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b1c667552795ef78c81447baaad773108b77669a36ee84858e710634d4d51690
-  data.tar.gz: b45c8ff19cd462003a01b82114021c81ebc1891fbdb00e42b2fc48f07aeed2a1
+  metadata.gz: b7b478817815b6f14e75a5589f7ebc3b7f810693ecf127b6dadb9d6336b6071a
+  data.tar.gz: 2387b343d12df0c0cf30505213ff5e4dd2041903c5510a4a467ddddd34334c73
 SHA512:
-  metadata.gz: eeb24ce08dd3d3cf2dfddb3116719bc11365ab902111a8bc62a887bb3054c74ae062fa6028f8fdddce2b2153359cb8f4a290e4e300fd295e3f1ba87f0c9b22b5
-  data.tar.gz: 98bd38fda86ed2cf459f6bb3a404f13b9f078650301ef89e4e6872ca32e234313f4f8d12bf819bb8b8af57710226d5528cc0fa59ec0b9593fc56a18c8a1245ac
+  metadata.gz: 39348cd63dc6728f48462cdcfab927c223af1966d74a5d256d5b85a9518a2732c4b407639d39cc9f6801cd11b1f50d94875754a994b25d2ffe62bb15e5e520ce
+  data.tar.gz: 233afee76a95e53ef9cc0bd324a6d16acc8d23b4158e5977aa03321553f14d1dd4c472045beb3b2f88bc9b31e0da3792f640f01538656174e4ea538bb9881b8e

data/definitions/features/foreman_proxy.rb

@@ -94,11 +94,7 @@ class Features::ForemanProxy < ForemanMaintain::Feature
   end
 
   def certs_param_name
-    if check_min_version('foreman', '1.21')
-      return { :param_section => 'certs', :param_key => 'tar_file' }
-    end
-
-    { :param_section => 'foreman_proxy_content', :param_key => 'certs_tar' }
+    { :param_section => 'certs', :param_key => 'tar_file' }
   end
 
   def certs_tar

data/definitions/procedures/packages/update.rb

@@ -7,11 +7,12 @@ module Procedures::Packages
       param :warn_on_errors, 'Do not interrupt scenario on failure',
         :flag => true, :default => false
       param :dnf_options, 'Extra dnf options if any', :array => true, :default => []
+      param :clean_cache, 'If true will cause a DNF cache clean', :flag => true, :default => true
     end
 
     def run
       assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
-      package_manager.clean_cache(:assumeyes => assumeyes_val)
+      package_manager.clean_cache(:assumeyes => assumeyes_val) if @clean_cache
       opts = { :assumeyes => assumeyes_val, :dnf_options => @dnf_options }
       packages_action(:update, @packages, opts)
     rescue ForemanMaintain::Error::ExecutionError => e
@@ -27,11 +28,15 @@ module Procedures::Packages
     end
 
     def description
-      if @dnf_options.include?('--downloadonly')
+      if download_only?
         "Download package(s) #{@packages.join(', ')}"
       else
         "Update package(s) #{@packages.join(', ')}"
       end
     end
+
+    def download_only?
+      @dnf_options.include?('--downloadonly')
+    end
   end
 end

data/definitions/scenarios/{upgrade_to_capsule_6_15_z.rb → upgrade_to_capsule_6_16.rb}

@@ -1,4 +1,4 @@
-module Scenarios::Capsule_6_15_z
+module Scenarios::Capsule_6_16
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
@@ -6,20 +6,20 @@ module Scenarios::Capsule_6_15_z
         confine do
           feature(:capsule) &&
             (feature(:capsule).current_minor_version == '6.15' || \
-              ForemanMaintain.upgrade_in_progress == '6.15.z')
+            ForemanMaintain.upgrade_in_progress == '6.16')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.15.z'
+      '6.16'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Capsule 6.15.z'
+      description 'Checks before upgrading to Capsule 6.16'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -27,24 +27,32 @@ module Scenarios::Capsule_6_15_z
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Repositories::Validate.new(:version => '6.15'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.16'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Capsule 6.15.z'
+      description 'Procedures before migrating to Capsule 6.16'
       tags :pre_migrations
     end
 
     def compose
+      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
+      modules_to_enable = ["satellite-capsule:#{el_short_name}"]
+      add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
+      add_step(Procedures::Packages::Update.new(
+        :assumeyes => true,
+        :dnf_options => ['--downloadonly']
+      ))
+
       add_steps(find_procedures(:pre_migrations))
     end
   end
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Capsule 6.15.z'
+      description 'Migration scripts to Capsule 6.16'
       tags :migrations
     end
 
@@ -53,20 +61,15 @@ module Scenarios::Capsule_6_15_z
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
-      modules_to_enable = ["satellite-capsule:#{el_short_name}"]
-      add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      add_step(Procedures::Packages::Update.new(:assumeyes => true,
-        :dnf_options => ['--downloadonly']))
       add_step(Procedures::Service::Stop.new)
-      add_step(Procedures::Packages::Update.new(:assumeyes => true))
+      add_step(Procedures::Packages::Update.new(:assumeyes => true, :clean_cache => false))
       add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Capsule 6.15.z'
+      description 'Procedures after migrating to Capsule 6.16'
       tags :post_migrations
     end
 
@@ -79,7 +82,7 @@ module Scenarios::Capsule_6_15_z
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Capsule 6.15.z'
+      description 'Checks after upgrading to Capsule 6.16'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/definitions/scenarios/{upgrade_to_capsule_6_15.rb → upgrade_to_capsule_6_16_z.rb}

@@ -1,25 +1,25 @@
-module Scenarios::Capsule_6_15
+module Scenarios::Capsule_6_16_z
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
         tags :upgrade_scenario
         confine do
           feature(:capsule) &&
-            (feature(:capsule).current_minor_version == '6.14' || \
-            ForemanMaintain.upgrade_in_progress == '6.15')
+            (feature(:capsule).current_minor_version == '6.16' || \
+              ForemanMaintain.upgrade_in_progress == '6.16.z')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.15'
+      '6.16.z'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Capsule 6.15'
+      description 'Checks before upgrading to Capsule 6.16.z'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -27,24 +27,31 @@ module Scenarios::Capsule_6_15
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Repositories::Validate.new(:version => '6.15'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.16'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Capsule 6.15'
+      description 'Procedures before migrating to Capsule 6.16.z'
       tags :pre_migrations
     end
 
     def compose
+      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
+      modules_to_enable = ["satellite-capsule:#{el_short_name}"]
+      add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
+      add_step(Procedures::Packages::Update.new(
+        :assumeyes => true,
+        :dnf_options => ['--downloadonly']
+      ))
       add_steps(find_procedures(:pre_migrations))
     end
   end
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Capsule 6.15'
+      description 'Migration scripts to Capsule 6.16.z'
       tags :migrations
     end
 
@@ -53,20 +60,15 @@ module Scenarios::Capsule_6_15
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
-      modules_to_enable = ["satellite-capsule:#{el_short_name}"]
-      add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      add_step(Procedures::Packages::Update.new(:assumeyes => true,
-        :dnf_options => ['--downloadonly']))
       add_step(Procedures::Service::Stop.new)
-      add_step(Procedures::Packages::Update.new(:assumeyes => true))
+      add_step(Procedures::Packages::Update.new(:assumeyes => true, :clean_cache => false))
       add_step_with_context(Procedures::Installer::Upgrade)
     end
   end
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Capsule 6.15'
+      description 'Procedures after migrating to Capsule 6.16.z'
       tags :post_migrations
     end
 
@@ -79,7 +81,7 @@ module Scenarios::Capsule_6_15
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Capsule 6.15'
+      description 'Checks after upgrading to Capsule 6.16.z'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/definitions/scenarios/upgrade_to_katello_nightly.rb

@@ -54,10 +54,12 @@ module Scenarios::Katello_Nightly
       add_step(Procedures::Repositories::Setup.new(:version => 'nightly'))
       modules_to_enable = ["katello:#{el_short_name}", "pulpcore:#{el_short_name}"]
       add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      add_step(Procedures::Packages::Update.new(:assumeyes => true,
-        :dnf_options => ['--downloadonly']))
+      add_step(Procedures::Packages::Update.new(
+        :assumeyes => true,
+        :dnf_options => ['--downloadonly']
+      ))
       add_step(Procedures::Service::Stop.new)
-      add_step(Procedures::Packages::Update.new(:assumeyes => true))
+      add_step(Procedures::Packages::Update.new(:assumeyes => true, :clean_cache => false))
       add_step_with_context(Procedures::Installer::Upgrade)
     end
   end

data/definitions/scenarios/{upgrade_to_satellite_6_15_z.rb → upgrade_to_satellite_6_16.rb}

@@ -1,4 +1,4 @@
-module Scenarios::Satellite_6_15_z
+module Scenarios::Satellite_6_16
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
@@ -6,20 +6,20 @@ module Scenarios::Satellite_6_15_z
         confine do
           feature(:satellite) &&
             (feature(:satellite).current_minor_version == '6.15' || \
-            ForemanMaintain.upgrade_in_progress == '6.15.z')
+            ForemanMaintain.upgrade_in_progress == '6.16')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.15.z'
+      '6.16'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Satellite 6.15.z'
+      description 'Checks before upgrading to Satellite 6.16'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -27,25 +27,33 @@ module Scenarios::Satellite_6_15_z
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Repositories::Validate.new(:version => '6.15'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.16'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Satellite 6.15.z'
+      description 'Procedures before migrating to Satellite 6.16'
       tags :pre_migrations
     end
 
     def compose
+      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
+      modules_to_enable = ["satellite:#{el_short_name}"]
+      add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
+      add_step(Procedures::Packages::Update.new(
+        :assumeyes => true,
+        :dnf_options => ['--downloadonly']
+      ))
       add_steps(find_procedures(:pre_migrations))
     end
   end
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Satellite 6.15.z'
+      description 'Migration scripts to Satellite 6.16'
       tags :migrations
+      run_strategy :fail_fast
     end
 
     def set_context_mapping
@@ -53,13 +61,8 @@ module Scenarios::Satellite_6_15_z
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
-      modules_to_enable = ["satellite:#{el_short_name}"]
-      add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      add_step(Procedures::Packages::Update.new(:assumeyes => true,
-        :dnf_options => ['--downloadonly']))
       add_step(Procedures::Service::Stop.new)
-      add_step(Procedures::Packages::Update.new(:assumeyes => true))
+      add_step(Procedures::Packages::Update.new(:assumeyes => true, :clean_cache => false))
       add_step_with_context(Procedures::Installer::Upgrade)
       add_step(Procedures::Installer::UpgradeRakeTask)
     end
@@ -67,7 +70,7 @@ module Scenarios::Satellite_6_15_z
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Satellite 6.15.z'
+      description 'Procedures after migrating to Satellite 6.16'
       tags :post_migrations
     end
 
@@ -80,7 +83,7 @@ module Scenarios::Satellite_6_15_z
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Satellite 6.15.z'
+      description 'Checks after upgrading to Satellite 6.16'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/definitions/scenarios/{upgrade_to_satellite_6_15.rb → upgrade_to_satellite_6_16_z.rb}

@@ -1,25 +1,25 @@
-module Scenarios::Satellite_6_15
+module Scenarios::Satellite_6_16_z
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
         tags :upgrade_scenario
         confine do
           feature(:satellite) &&
-            (feature(:satellite).current_minor_version == '6.14' || \
-            ForemanMaintain.upgrade_in_progress == '6.15')
+            (feature(:satellite).current_minor_version == '6.16' || \
+            ForemanMaintain.upgrade_in_progress == '6.16.z')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.15'
+      '6.16.z'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Satellite 6.15'
+      description 'Checks before upgrading to Satellite 6.16.z'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -27,26 +27,32 @@ module Scenarios::Satellite_6_15
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Repositories::Validate.new(:version => '6.15'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.16'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Satellite 6.15'
+      description 'Procedures before migrating to Satellite 6.16.z'
       tags :pre_migrations
     end
 
     def compose
+      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
+      modules_to_enable = ["satellite:#{el_short_name}"]
+      add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
+      add_step(Procedures::Packages::Update.new(
+        :assumeyes => true,
+        :dnf_options => ['--downloadonly']
+      ))
       add_steps(find_procedures(:pre_migrations))
     end
   end
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Satellite 6.15'
+      description 'Migration scripts to Satellite 6.16.z'
       tags :migrations
-      run_strategy :fail_fast
     end
 
     def set_context_mapping
@@ -54,13 +60,8 @@ module Scenarios::Satellite_6_15
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
-      modules_to_enable = ["satellite:#{el_short_name}"]
-      add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      add_step(Procedures::Packages::Update.new(:assumeyes => true,
-        :dnf_options => ['--downloadonly']))
       add_step(Procedures::Service::Stop.new)
-      add_step(Procedures::Packages::Update.new(:assumeyes => true))
+      add_step(Procedures::Packages::Update.new(:assumeyes => true, :clean_cache => false))
       add_step_with_context(Procedures::Installer::Upgrade)
       add_step(Procedures::Installer::UpgradeRakeTask)
     end
@@ -68,7 +69,7 @@ module Scenarios::Satellite_6_15
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Satellite 6.15'
+      description 'Procedures after migrating to Satellite 6.16.z'
       tags :post_migrations
     end
 
@@ -81,7 +82,7 @@ module Scenarios::Satellite_6_15
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Satellite 6.15'
+      description 'Checks after upgrading to Satellite 6.16.z'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/lib/foreman_maintain/package_manager/dnf.rb

@@ -92,7 +92,7 @@ module ForemanMaintain::PackageManager
     end
 
     def clean_cache(assumeyes: false)
-      dnf_action('clean', 'all', :assumeyes => assumeyes)
+      dnf_action('clean', 'metadata', :assumeyes => assumeyes)
     end
 
     def module_enabled?(name)

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.4.4'.freeze
+  VERSION = '1.5.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.4.4
+  version: 1.5.1
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-12-14 00:00:00.000000000 Z
+date: 2024-02-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -181,7 +181,6 @@ files:
 - definitions/checks/foreman_tasks/invalid/check_planning_state.rb
 - definitions/checks/foreman_tasks/not_paused.rb
 - definitions/checks/foreman_tasks/not_running.rb
-- definitions/checks/katello_agent.rb
 - definitions/checks/maintenance_mode/check_consistency.rb
 - definitions/checks/non_rh_packages.rb
 - definitions/checks/package_manager/dnf/validate_dnf_config.rb
@@ -327,12 +326,12 @@ files:
 - definitions/scenarios/restore.rb
 - definitions/scenarios/self_upgrade.rb
 - definitions/scenarios/services.rb
-- definitions/scenarios/upgrade_to_capsule_6_15.rb
-- definitions/scenarios/upgrade_to_capsule_6_15_z.rb
+- definitions/scenarios/upgrade_to_capsule_6_16.rb
+- definitions/scenarios/upgrade_to_capsule_6_16_z.rb
 - definitions/scenarios/upgrade_to_foreman_nightly.rb
 - definitions/scenarios/upgrade_to_katello_nightly.rb
-- definitions/scenarios/upgrade_to_satellite_6_15.rb
-- definitions/scenarios/upgrade_to_satellite_6_15_z.rb
+- definitions/scenarios/upgrade_to_satellite_6_16.rb
+- definitions/scenarios/upgrade_to_satellite_6_16_z.rb
 - extras/foreman-maintain.sh
 - extras/foreman_protector/dnf/foreman-protector.py
 - extras/foreman_protector/foreman-protector.conf

data/definitions/checks/katello_agent.rb

@@ -1,39 +0,0 @@
-class Checks::CheckKatelloAgentEnabled < ForemanMaintain::Check
-  metadata do
-    label :check_katello_agent_enabled
-    description 'Check whether the katello-agent feature is enabled before upgrading'
-    tags :pre_upgrade
-
-    confine do
-      !feature(:capsule)
-    end
-  end
-
-  def run
-    instance_name = feature(:instance).downstream ? "Satellite" : "Katello"
-    instance_version = feature(:instance).downstream ? "6.15" : "4.10"
-    installer_command = feature(:instance).downstream ? "satellite-installer" : "foreman-installer"
-    maintain_command = feature(:instance).downstream ? "satellite-maintain" : "foreman-maintain"
-
-    assert(
-      !katello_agent_enabled?,
-      "The katello-agent feature is enabled on this system. As of #{instance_name}"\
-      " #{instance_version}, katello-agent is removed and will no longer function."\
-      " Before proceeding with the upgrade, you should ensure that you have deployed"\
-      " and configured an alternative tool for remote package management and patching"\
-      " for content hosts, such as Remote Execution (REX) with pull-based transport."\
-      " See the Managing Hosts guide in the #{instance_name} documentation for more info."\
-      " Disable katello-agent with the command"\
-      " `#{installer_command} --foreman-proxy-content-enable-katello-agent false`"\
-      " before proceeding with the upgrade. Alternatively, you may skip this check and proceed by"\
-      " running #{maintain_command} again with the `--whitelist` option, which will automatically"\
-      " uninstall katello-agent."
-    )
-  end
-
-  private
-
-  def katello_agent_enabled?
-    feature(:installer).answers['foreman_proxy_content']['enable_katello_agent']
-  end
-end