foreman_maintain 1.0.12 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 40bec791581fb8e2670586e331afd5e89ba1ca436b38d95e848837fc8ce1fdd3
-  data.tar.gz: 54f35bb8139e221173ca57786c93e36559957116577907fa936d0ff3f4256858
+  metadata.gz: 67560267151a5d6834a062b2bf14d776149cc6137cab2e260d96057ee61b6ef5
+  data.tar.gz: 7246d6a07958e7426f21f1094be8f2d84b7da1fcbc7422183770060c599c46a2
 SHA512:
-  metadata.gz: 2e00f5941e44f62e5fa09d47924fa231af050cf32ae555a775bdb247753c0b38d1a2b3c554e86d3699287f1a4367a461f780be6fca5c897031feffbf07de9f53
-  data.tar.gz: 80447d1b43a06edcdd7d9846637c4f484f8bd454e9bdda303355223f64671fa276e37e1c0c8bf50aff1c6213ed30d23028c850b31e1e9f3463b1660994109902
+  metadata.gz: 32034709e2b49b1ab049be1e934540dccb77440bfc01206149fc47da13bf3ab6d1a422105ea92c2cce74bc05e378774b480c80190f300abf5508b28573020c7b
+  data.tar.gz: 10c21481d5fcc501acd7b3e12b75195c1b52591c6b39bf4d66dda2503e723170201e72b7fa87851d4f6eb8cb14e2a455ec043ab0e425707e225482dd6d4f5316

data/definitions/procedures/packages/update.rb

@@ -6,12 +6,14 @@ module Procedures::Packages
       param :force, 'Do not skip if package is installed', :flag => true, :default => false
       param :warn_on_errors, 'Do not interrupt scenario on failure',
             :flag => true, :default => false
+      param :yum_options, 'Extra yum options if any', :array => true, :default => []
     end
 
     def run
       assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
       package_manager.clean_cache(:assumeyes => assumeyes_val)
-      packages_action(:update, @packages, :assumeyes => assumeyes_val)
+      opts = { :assumeyes => assumeyes_val, :yum_options => @yum_options }
+      packages_action(:update, @packages, opts)
     rescue ForemanMaintain::Error::ExecutionError => e
       if @warn_on_errors
         set_status(:warning, e.message)

data/definitions/procedures/pulp/remove.rb

@@ -24,7 +24,15 @@ module Procedures::Pulp
         '/var/lib/pulp/uploads',
         '/var/lib/mongodb/',
         '/var/cache/pulp'
-      ]
+      ].select { |dir| File.directory?(dir) }
+    end
+
+    def pulp_data_dirs_mountpoints
+      pulp_data_dirs.select { |d| Pathname(d).mountpoint? }
+    end
+
+    def deletable_pulp_dirs
+      @deletable_pulp_dirs ||= pulp_data_dirs - pulp_data_dirs_mountpoints
     end
 
     # rubocop:disable  Metrics/MethodLength
@@ -53,11 +61,12 @@ module Procedures::Pulp
       @installed_pulp_packages
     end
 
-    def data_dir_removal_cmds
-      pulp_data_dirs.select { |dir| File.directory?(dir) }.map { |dir| "rm -rf #{dir}" }
+    def data_dir_removal_cmds(pulp_dirs)
+      pulp_dirs.map { |dir| "rm -rf #{dir}" }
     end
 
-    def ask_to_proceed(rm_cmds)
+    def ask_to_proceed
+      rm_cmds = data_dir_removal_cmds(pulp_data_dirs)
       question = "\nWARNING: All pulp2 packages will be removed with the following commands:\n"
       question += "\n# rpm -e #{pulp_packages.join('  ')}" if pulp_packages.any?
       question += "\n# yum remove rh-mongodb34-*"
@@ -70,11 +79,9 @@ module Procedures::Pulp
     end
 
     def run
-      rm_cmds = data_dir_removal_cmds
-
       assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
 
-      ask_to_proceed(rm_cmds) unless assumeyes_val
+      ask_to_proceed unless assumeyes_val
 
       remove_pulp if pulp_packages.any?
 
@@ -86,7 +93,7 @@ module Procedures::Pulp
 
       drop_migrations
 
-      delete_pulp_data(rm_cmds) if rm_cmds.any?
+      delete_pulp_data
 
       restart_pulpcore_services
     end
@@ -163,12 +170,41 @@ module Procedures::Pulp
     end
     # rubocop:enable Metrics/BlockLength
 
-    def delete_pulp_data(rm_cmds)
-      with_spinner('Deleting pulp2 data directories') do |spinner|
-        rm_cmds.each do |cmd|
-          execute!(cmd)
+    def delete_pulp_data
+      non_mountpoints = data_dir_removal_cmds(deletable_pulp_dirs)
+      mountpoints = pulp_data_dirs_mountpoints
+      with_spinner('') do |spinner|
+        if non_mountpoints.any?
+          spinner.update('Deleting pulp2 data directories.')
+          non_mountpoints.each do |cmd|
+            execute!(cmd)
+          end
+          msg_for_del_non_mountpoints(mountpoints, spinner)
+        end
+        if mountpoints.any?
+          msg_for_del_mountpoints(mountpoints, spinner)
         end
-        spinner.update('Done deleting pulp2 data directories')
+      end
+    end
+
+    def msg_for_del_non_mountpoints(mountpoints, spinner)
+      if mountpoints.empty?
+        spinner.update('Done deleting all pulp2 data directories.')
+      else
+        spinner.update("Deleted: #{deletable_pulp_dirs.join("\n")}")
+      end
+    end
+
+    def msg_for_del_mountpoints(mountpoints, spinner)
+      _, cmd_name = ForemanMaintain.pkg_and_cmd_name
+      if mountpoints.count > 1
+        spinner.update("The directories #{mountpoints.join(',')} are individual mountpoints.")
+        puts  "\nThe #{cmd_name} won't delete these directories.\n"\
+              'You need to remove content and these directories on your own.'
+      else
+        spinner.update("The directory #{mountpoints.join(',')} is individual mountpoint.")
+        puts  "\nThe #{cmd_name} won't delete the directory.\n"\
+              'You need to remove content and the directory on your own.'
       end
     end
 

data/definitions/scenarios/self_upgrade.rb

@@ -1,18 +1,6 @@
 module ForemanMaintain::Scenarios
   class SelfUpgradeBase < ForemanMaintain::Scenario
     include ForemanMaintain::Concerns::Downstream
-    def enabled_system_repos_id
-      repository_manager.enabled_repos.keys
-    end
-
-    def enable_repos(repo_ids = stored_enabled_repos_ids)
-      add_step(Procedures::Repositories::Enable.new(repos: repo_ids))
-    end
-
-    def disable_repos(repo_ids = stored_enabled_repos_ids)
-      add_step(Procedures::Repositories::Disable.new(repos: repo_ids))
-    end
-
     def target_version
       current_full_version = feature(:instance).downstream.current_version
       @target_version ||= current_full_version.bump
@@ -44,36 +32,6 @@ module ForemanMaintain::Scenarios
       end
     end
 
-    def maintenance_repo_version
-      return '6' if current_version == '6.10'
-
-      current_version
-    end
-
-    def stored_enabled_repos_ids
-      @stored_enabled_repos_ids ||= begin
-        path = File.expand_path('enabled_repos.yml', ForemanMaintain.config.backup_dir)
-        @stored_enabled_repos_ids = File.file?(path) ? YAML.load(File.read(path)) : []
-      end
-    end
-
-    def all_maintenance_repos
-      repo_regex = if el7?
-                     /rhel-\d-server-satellite-maintenance-\d.\d-rpms/
-                   else
-                     /satellite-maintenance-\d.\d-for-rhel-\d-x86_64-rpms/
-                   end
-      stored_enabled_repos_ids.select { |id| !id.match(repo_regex).nil? }
-    end
-
-    def repos_ids_to_reenable
-      repos_ids_to_reenable = stored_enabled_repos_ids - all_maintenance_repos
-      if use_rhsm?
-        repos_ids_to_reenable << maintenance_repo(maintenance_repo_version)
-      end
-      repos_ids_to_reenable
-    end
-
     def use_rhsm?
       return false if maintenance_repo_label
 
@@ -100,30 +58,11 @@ module ForemanMaintain::Scenarios
     def compose
       if check_min_version('foreman', '2.5') || check_min_version('foreman-proxy', '2.5')
         pkgs_to_update = %w[satellite-maintain rubygem-foreman_maintain]
-        add_step(Procedures::Repositories::BackupEnabledRepos.new)
-        disable_repos
-        add_step(Procedures::Repositories::Enable.new(repos: req_repos_to_update_pkgs,
-                                                      use_rhsm: use_rhsm?))
-        add_step(Procedures::Packages::Update.new(packages: pkgs_to_update, assumeyes: true))
-        disable_repos('*')
-        enable_repos(repos_ids_to_reenable)
-      end
-    end
-  end
-
-  class SelfUpgradeRescue < SelfUpgradeBase
-    metadata do
-      label :rescue_self_upgrade
-      description 'Disables all version specific maintenance repositories and,'\
-  		 "\nenables the repositories which were configured prior to self upgrade"
-      manual_detection
-      run_strategy :fail_slow
-    end
-
-    def compose
-      if check_min_version('foreman', '2.5') || check_min_version('foreman-proxy', '2.5')
-        disable_repos('*')
-        enable_repos(repos_ids_to_reenable)
+        yum_options = req_repos_to_update_pkgs.map do |id|
+          "--enablerepo=#{id}"
+        end
+        add_step(Procedures::Packages::Update.new(packages: pkgs_to_update, assumeyes: true,
+                                                  yum_options: yum_options))
       end
     end
   end

data/definitions/scenarios/upgrade_to_capsule_6_11.rb

@@ -40,6 +40,7 @@ module Scenarios::Capsule_6_11
     def compose
       add_steps(find_procedures(:pre_migrations))
       add_step(Procedures::Pulp::Remove.new(:assumeyes => true))
+      add_step(Procedures::Content::FixPulpcoreArtifactOwnership.new(:assumeyes => true))
       add_step(Procedures::Service::Stop.new)
     end
   end

data/definitions/scenarios/upgrade_to_capsule_6_11_z.rb

@@ -39,6 +39,7 @@ module Scenarios::Capsule_6_11_z
 
     def compose
       add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::Content::FixPulpcoreArtifactOwnership.new(:assumeyes => true))
       add_step(Procedures::Service::Stop.new)
     end
   end

data/definitions/scenarios/upgrade_to_satellite_6_11.rb

@@ -42,6 +42,7 @@ module Scenarios::Satellite_6_11
     def compose
       add_steps(find_procedures(:pre_migrations))
       add_step(Procedures::Pulp::Remove.new(:assumeyes => true))
+      add_step(Procedures::Content::FixPulpcoreArtifactOwnership.new(:assumeyes => true))
       add_step(Procedures::Service::Stop.new)
     end
   end

data/definitions/scenarios/upgrade_to_satellite_6_11_z.rb

@@ -39,6 +39,7 @@ module Scenarios::Satellite_6_11_z
 
     def compose
       add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::Content::FixPulpcoreArtifactOwnership.new(:assumeyes => true))
       add_step(Procedures::Service::Stop.new)
     end
   end

data/lib/foreman_maintain/cli/self_upgrade_command.rb

@@ -5,7 +5,7 @@ module ForemanMaintain
              'Repository label from which packages should be updated.'\
              'This can be used when standard CDN repositories are unavailable.'
       def execute
-        run_scenario(upgrade_scenario, upgrade_rescue_scenario)
+        run_scenario(upgrade_scenario)
       end
 
       def upgrade_scenario
@@ -13,12 +13,6 @@ module ForemanMaintain
           maintenance_repo_label: maintenance_repo_label
         )
       end
-
-      def upgrade_rescue_scenario
-        Scenarios::SelfUpgradeRescue.new(
-          maintenance_repo_label: maintenance_repo_label
-        )
-      end
     end
   end
 end

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -100,12 +100,13 @@ module ForemanMaintain
       end
 
       def packages_action(action, packages, options = {})
-        options.validate_options!(:assumeyes)
+        options.validate_options!(:assumeyes, :yum_options)
         case action
         when :install
           package_manager.install(packages, :assumeyes => options[:assumeyes])
         when :update
-          package_manager.update(packages, :assumeyes => options[:assumeyes])
+          package_manager.update(packages, :assumeyes => options[:assumeyes],
+                                           :yum_options => options[:yum_options])
         when :remove
           package_manager.remove(packages, :assumeyes => options[:assumeyes])
         else

data/lib/foreman_maintain/package_manager/yum.rb

@@ -55,8 +55,8 @@ module ForemanMaintain::PackageManager
       yum_action('remove', packages, :assumeyes => assumeyes)
     end
 
-    def update(packages = [], assumeyes: false)
-      yum_action('update', packages, :assumeyes => assumeyes)
+    def update(packages = [], assumeyes: false, yum_options: [])
+      yum_action('update', packages, :assumeyes => assumeyes, :yum_options => yum_options)
     end
 
     def clean_cache(assumeyes: false)
@@ -116,8 +116,12 @@ module ForemanMaintain::PackageManager
       File.open(protector_config_file, 'w') { |file| file.puts config }
     end
 
-    def yum_action(action, packages, with_status: false, assumeyes: false, valid_exit_statuses: [0])
-      yum_options = []
+    # rubocop:disable Metrics/AbcSize, Metrics/MethodLength
+    def yum_action(action, packages, options)
+      with_status = options.fetch(:with_status, false)
+      assumeyes = options.fetch(:assumeyes, false)
+      valid_exit_statuses = options.fetch(:valid_exit_statuses, [0])
+      yum_options = options.fetch(:yum_options, [])
       packages = [packages].flatten(1)
       yum_options << '-y' if assumeyes
       yum_options << '--disableplugin=foreman-protector'

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.0.12'.freeze
+  VERSION = '1.0.15'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.15
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-06-08 00:00:00.000000000 Z
+date: 2022-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp