foreman_maintain 0.6.2 → 0.6.7

data/lib/foreman_maintain/concerns/downstream.rb

@@ -87,8 +87,7 @@ module ForemanMaintain
                  else
                    "rhel-#{rh_version_major}-server-#{package_name}-#{full_version}-rpms"
                  end
-
-        if current_minor_version == '6.3' && server_version.to_s != '6.4' && (
+        if current_minor_version == '6.3' && full_version.to_s != '6.4' && (
           feature(:puppet_server) && feature(:puppet_server).puppet_version.major == 4)
           # TODO: confirm repo for capsule. It might be same repo
           repos << "rhel-#{rh_version_major}-server-satellite-tools-6.3-puppet4-rpms"
@@ -98,16 +97,17 @@ module ForemanMaintain
       end
 
       def common_repos(rh_version_major, full_version)
-        tools_repo_id = "rhel-#{rh_version_major}-server-satellite-tools-#{full_version}-rpms"
-        maintenance_repo_id = "rhel-#{rh_version_major}-server-satellite-maintenance-6-rpms"
+        repos_arrary = if ENV['FOREMAN_MAINTAIN_USE_BETA'] == '1'
+                         ["rhel-#{rh_version_major}-server-satellite-maintenance-6-beta-rpms",
+                          "rhel-#{rh_version_major}-server-satellite-tools-6-beta-rpms"]
+                       else
+                         ["rhel-#{rh_version_major}-server-satellite-maintenance-6-rpms",
+                          "rhel-#{rh_version_major}-server-satellite-tools-#{full_version}-rpms"]
+                       end
 
-        # Override to use Beta repositories for sat version until GA
-        if ENV['FOREMAN_MAINTAIN_USE_BETA'] == '1'
-          tools_repo_id = "rhel-#{rh_version_major}-server-satellite-tools-6-beta-rpms"
-          maintenance_repo_id = "rhel-#{rh_version_major}-server-satellite-maintenance-6-beta-rpms"
-        end
+        return repos_arrary.first(1) if feature(:capsule)
 
-        [tools_repo_id, maintenance_repo_id]
+        repos_arrary
       end
 
       def main_rh_repos(rh_version_major)

data/lib/foreman_maintain/package_manager/dnf.rb

@@ -1,17 +1,23 @@
 module ForemanMaintain::PackageManager
   class Dnf < Yum
-    def clean_cache
-      dnf_action('clean', 'all')
+    def clean_cache(assumeyes: false)
+      dnf_action('clean', 'all', :assumeyes => assumeyes)
       super
     end
 
     private
 
-    def dnf_action(action, packages, assumeyes: false)
+    def dnf_action(action, packages, with_status: false, assumeyes: false)
       yum_options = []
       yum_options << '-y' if assumeyes
-      sys.execute!("dnf #{yum_options.join(' ')} #{action} #{packages.join(' ')}",
-                   :interactive => true)
+      if with_status
+        sys.execute_with_status("dnf #{yum_options.join(' ')} #{action} #{packages.join(' ')}",
+                                :interactive => !assumeyes)
+      else
+        sys.execute!("dnf #{yum_options.join(' ')} #{action} #{packages.join(' ')}",
+                     :interactive => !assumeyes)
+
+      end
     end
   end
 end

data/lib/foreman_maintain/package_manager/yum.rb

@@ -57,8 +57,13 @@ module ForemanMaintain::PackageManager
       yum_action('update', packages, :assumeyes => assumeyes)
     end
 
-    def clean_cache
-      yum_action('clean', 'all')
+    def clean_cache(assumeyes: false)
+      yum_action('clean', 'all', :assumeyes => assumeyes)
+    end
+
+    def update_available?(package)
+      cmd_output = yum_action('check-update -q', package, :with_status => true, :assumeyes => false)
+      cmd_output[0] == 100
     end
 
     def files_not_owned_by_package(directory)
@@ -96,14 +101,19 @@ module ForemanMaintain::PackageManager
       File.open(protector_config_file, 'w') { |file| file.puts config }
     end
 
-    def yum_action(action, packages, assumeyes: false)
+    def yum_action(action, packages, with_status: false, assumeyes: false)
       yum_options = []
       packages = [packages].flatten(1)
       yum_options << '-y' if assumeyes
       yum_options_s = yum_options.empty? ? '' : ' ' + yum_options.join(' ')
       packages_s = packages.empty? ? '' : ' ' + packages.join(' ')
-      sys.execute!("yum#{yum_options_s} #{action}#{packages_s}",
-                   :interactive => true)
+      if with_status
+        sys.execute_with_status("yum#{yum_options_s} #{action}#{packages_s}",
+                                :interactive => !assumeyes)
+      else
+        sys.execute!("yum#{yum_options_s} #{action}#{packages_s}",
+                     :interactive => !assumeyes)
+      end
     end
 
     def install_extras(src, dest, override: false)

data/lib/foreman_maintain/reporter/cli_reporter.rb

@@ -16,7 +16,6 @@ module ForemanMaintain
           @spinner_chars = %w[| / - \\]
           @current_line = ''
           @puts_needed = false
-          start_spinner
         end
 
         def update(line)
@@ -42,8 +41,6 @@ module ForemanMaintain
           end
         end
 
-        private
-
         def start_spinner
           @thread = Thread.new do
             loop do
@@ -53,6 +50,8 @@ module ForemanMaintain
           end
         end
 
+        private
+
         def spin
           @mutex.synchronize do
             return unless @active
@@ -80,6 +79,7 @@ module ForemanMaintain
         @line_char = '-'
         @cell_char = '|'
         @spinner = Spinner.new(self)
+        @spinner.start_spinner if @stdout.tty?
         @last_line = ''
       end
 

data/lib/foreman_maintain/upgrade_runner.rb

@@ -15,29 +15,8 @@ module ForemanMaintain
       def available_targets
         # when some upgrade is in progress, we don't allow upgrade to different version
         return [current_target_version] if current_target_version
-        versions_to_tags.inject([]) do |available_targets, (version, tag)|
-          if !find_scenarios(:tags => [tag]).empty?
-            available_targets << version
-          else
-            available_targets
-          end
-        end.sort
-      end
-
-      def versions_to_tags
-        @versions_to_tags ||= {}
-      end
-
-      # registers target version to specific tag
-      def register_version(version, tag)
-        if versions_to_tags.key?(version) && versions_to_tags[version] != tag
-          raise "Version #{version} already registered to tag #{versions_to_tags[version]}"
-        end
-        @versions_to_tags[version] = tag
-      end
 
-      def clear_register
-        versions_to_tags.clear
+        find_scenarios(:tags => :upgrade_scenario).map(&:target_version).uniq.sort
       end
 
       def current_target_version
@@ -57,25 +36,35 @@ module ForemanMaintain
 
     def initialize(version, reporter, options = {})
       super(reporter, [], options)
-      @tag = self.class.versions_to_tags[version]
-      raise "Unknown version #{version}" unless tag
       @version = version
+      scenarios_present = find_scenarios(:tags => :upgrade_scenario).any?(&matching_version_test)
+      raise "Unknown version #{version}" unless scenarios_present
+
       @scenario_cache = {}
       self.phase = :pre_upgrade_checks
     end
 
     def scenario(phase)
       return @scenario_cache[phase] if @scenario_cache.key?(phase)
-      condition = { :tags => [tag, phase] }
-      matching_scenarios = find_all_scenarios(condition)
+
+      condition = { :tags => [:upgrade_scenario, phase] }
+      matching_scenarios = find_scenarios(condition).select(&matching_version_test)
       raise "Too many scenarios match #{condition.inspect}" if matching_scenarios.size > 1
+
       @scenario_cache[phase] = matching_scenarios.first
     end
 
+    def matching_version_test
+      proc do |scenario|
+        scenario.respond_to?(:target_version) && scenario.target_version == @version
+      end
+    end
+
     def run
       self.class.current_target_version = @version
       PHASES.each do |phase|
         return run_rollback if quit?
+
         if skip?(phase)
           skip_phase(phase)
         else
@@ -127,6 +116,7 @@ module ForemanMaintain
     # deserializes the state of the run from the storage
     def load
       return unless storage[:serialized]
+
       load_from_hash(storage[:serialized])
     end
 
@@ -134,6 +124,7 @@ module ForemanMaintain
       with_non_empty_scenario(phase) do |scenario|
         confirm_scenario(scenario)
         return if quit?
+
         self.phase = phase
         run_scenario(scenario)
         # if we started from the :pre_upgrade_checks, ensure to ask before
@@ -158,6 +149,7 @@ module ForemanMaintain
     # rubocop:disable Metrics/MethodLength
     def rollback_pre_migrations
       raise "Unexpected phase #{phase}, expecting pre_migrations" unless phase == :pre_migrations
+
       rollback_needed = scenario(:pre_migrations).steps.any? { |s| s.executed? && s.success? }
       if rollback_needed
         @quit = false
@@ -198,6 +190,7 @@ module ForemanMaintain
       unless @scenario_cache.empty?
         raise "Some scenarios are already initialized: #{@scenario_cache.keys}"
       end
+
       self.phase = hash[:phase]
       hash[:scenarios].each do |key, scenario_hash|
         @scenario_cache[key] = Scenario.new_from_hash(scenario_hash)
@@ -229,6 +222,7 @@ module ForemanMaintain
 
     def phase=(phase)
       raise "Unknown phase #{phase}" unless PHASES.include?(phase)
+
       @phase = phase
     end
   end

data/lib/foreman_maintain/utils/backup.rb

@@ -204,6 +204,10 @@ module ForemanMaintain
       def incremental?
         !!metadata.fetch('incremental', false)
       end
+
+      def online_backup?
+        !!metadata.fetch('online', false)
+      end
     end
   end
 end

data/lib/foreman_maintain/utils/facter.rb

@@ -5,7 +5,7 @@ module ForemanMaintain::Utils
     FACTER_FILES = %w[/usr/bin/facter /opt/puppetlabs/bin/facter].freeze
 
     def self.package
-      puppet_version = version(execute!('puppet --version'))
+      puppet_version = version(execute!('/opt/puppetlabs/bin/puppet --version'))
 
       puppet_version.major >= 4 ? 'puppet-agent' : 'facter'
     end

data/lib/foreman_maintain/utils/service/abstract.rb

@@ -10,6 +10,12 @@ module ForemanMaintain::Utils
         @options = options
       end
 
+      def socket
+        if @options[:socket]
+          self.class.new("#{@options[:socket]}.socket", priority)
+        end
+      end
+
       def <=>(other)
         prio_cmp = @priority <=> other.priority
         prio_cmp == 0 ? @name <=> other.name : prio_cmp

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.6.2'.freeze
+  VERSION = '0.6.7'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.6.7
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-13 00:00:00.000000000 Z
+date: 2020-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -122,17 +122,19 @@ files:
 - definitions/checks/backup/directory_ready.rb
 - definitions/checks/candlepin/db_up.rb
 - definitions/checks/candlepin/validate_db.rb
-- definitions/checks/check_epel_repository.rb
 - definitions/checks/check_hotfix_installed.rb
 - definitions/checks/check_tmout.rb
 - definitions/checks/disk/available_space.rb
 - definitions/checks/disk/performance.rb
+- definitions/checks/env_proxy.rb
 - definitions/checks/foreman/check_corrupted_roles.rb
 - definitions/checks/foreman/check_duplicate_roles.rb
 - definitions/checks/foreman/db_up.rb
 - definitions/checks/foreman/facts_names.rb
 - definitions/checks/foreman/puppet_class_duplicates.rb
+- definitions/checks/foreman/validate_external_db_version.rb
 - definitions/checks/foreman_openscap/invalid_report_associations.rb
+- definitions/checks/foreman_proxy/check_tftp_storage.rb
 - definitions/checks/foreman_proxy/verify_dhcp_config_syntax.rb
 - definitions/checks/foreman_tasks/invalid/check_old.rb
 - definitions/checks/foreman_tasks/invalid/check_pending_state.rb
@@ -147,6 +149,7 @@ files:
 - definitions/checks/puppet/provide_upgrade_guide.rb
 - definitions/checks/puppet/verify_no_empty_cacert_requests.rb
 - definitions/checks/remote_execution/verify_settings_file_already_exists.rb
+- definitions/checks/repositories/check_non_rh_repository.rb
 - definitions/checks/repositories/check_upstream_repository.rb
 - definitions/checks/repositories/validate.rb
 - definitions/checks/restore/validate_backup.rb
@@ -157,6 +160,7 @@ files:
 - definitions/checks/system_registration.rb
 - definitions/checks/version_locking_enabled.rb
 - definitions/checks/yum_exclude.rb
+- definitions/features/apache.rb
 - definitions/features/candlepin.rb
 - definitions/features/candlepin_database.rb
 - definitions/features/capsule.rb
@@ -263,6 +267,7 @@ files:
 - definitions/procedures/restore/pg_global_objects.rb
 - definitions/procedures/restore/postgres_owner.rb
 - definitions/procedures/restore/pulpcore_dump.rb
+- definitions/procedures/restore/regenerate_queues.rb
 - definitions/procedures/selinux/set_file_security.rb
 - definitions/procedures/service/base.rb
 - definitions/procedures/service/daemon_reload.rb
@@ -276,10 +281,13 @@ files:
 - definitions/procedures/sync_plans/disable.rb
 - definitions/procedures/sync_plans/enable.rb
 - definitions/scenarios/backup.rb
+- definitions/scenarios/content.rb
 - definitions/scenarios/maintenance_mode.rb
 - definitions/scenarios/packages.rb
 - definitions/scenarios/restore.rb
 - definitions/scenarios/services.rb
+- definitions/scenarios/upgrade_to_capsule_6_8.rb
+- definitions/scenarios/upgrade_to_capsule_6_8_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_2.rb
 - definitions/scenarios/upgrade_to_satellite_6_2_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_3.rb
@@ -292,6 +300,8 @@ files:
 - definitions/scenarios/upgrade_to_satellite_6_6_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_7.rb
 - definitions/scenarios/upgrade_to_satellite_6_7_z.rb
+- definitions/scenarios/upgrade_to_satellite_6_8.rb
+- definitions/scenarios/upgrade_to_satellite_6_8_z.rb
 - extras/foreman-maintain.sh
 - extras/foreman_protector/foreman-protector.conf
 - extras/foreman_protector/foreman-protector.py
@@ -309,6 +319,7 @@ files:
 - lib/foreman_maintain/cli/advanced_command.rb
 - lib/foreman_maintain/cli/backup_command.rb
 - lib/foreman_maintain/cli/base.rb
+- lib/foreman_maintain/cli/content_command.rb
 - lib/foreman_maintain/cli/health_command.rb
 - lib/foreman_maintain/cli/maintenance_mode_command.rb
 - lib/foreman_maintain/cli/packages_command.rb
@@ -390,7 +401,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt

data/definitions/checks/check_epel_repository.rb

@@ -1,21 +0,0 @@
-class Checks::CheckEpelRepository < ForemanMaintain::Check
-  metadata do
-    label :check_epel_repository
-    description 'Check if EPEL repository enabled on system'
-    tags :pre_upgrade
-    confine do
-      feature(:instance).downstream
-    end
-  end
-
-  def run
-    with_spinner('Checking for presence of EPEL repository') do
-      assert(!epel_enabled?, 'System is subscribed to EPEL repository')
-    end
-  end
-
-  def epel_enabled?
-    system_repos = execute("yum repolist enabled -d 6 -e 0| grep -E 'Repo-baseurl|Repo-id'")
-    system_repos.to_s.match(/\bepel\b/i)
-  end
-end