foreman_maintain 0.7.8 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae46ef9452f9bbb61d9f453a1d3aba399aa39aad83c8340ba2ba7129196eb6ec
-  data.tar.gz: daae5660ce5a676c230b6ef4360e7341f3fdb5d82ce46cc53a0ac3596926ab94
+  metadata.gz: e7e6e1bff90945614408bb1ae3e73b9a12fd43d75d7d164da74c9292e87f7d56
+  data.tar.gz: 8f7d7d509bd2e88738a9025bd53c2a09f21933a65c4d1ce617ade128a2473542
 SHA512:
-  metadata.gz: 62d82ea9a9d4ece0797e5872b8b0a551940864965416b23f3dfa7a7b054c68b8cd684d76f2cfd85532d6c744ab9f88942b03a8282a43aac96ae2282cb2a715ec
-  data.tar.gz: 00f495d544d54df325d9e0541a0b206dab5fbd2a2f5930e5d17eb86173d450e92926cc41c74379fda20a878ed634c8e473abfaf440d0034ae6c0c44e50c88fe5
+  metadata.gz: 69b30ba9d0f4aa6bd74ac5ec609c8e6baaa26954aee7b50291c244dd90571546381ba7f929ec36466eae92a745e62f9ce5855a5f671c851b87a8cb5ecc69f82f
+  data.tar.gz: 76f1d2b051c4b062e1719303b0b87c450847702b4dd2c784f7afa31195886e46e6fe44a342fad9d3d3d130ac514dc4addbb9bdff32cd03fb75a165024cc9f295

data/definitions/checks/disk/available_space_postgresql12.rb

@@ -0,0 +1,45 @@
+module Checks
+  module Disk
+    class AvailableSpacePostgresql12 < ForemanMaintain::Check
+      metadata do
+        label :available_space_for_postgresql12
+        description 'Check to make sure PostgreSQL 12 work directory has enough space for upgrade'
+        confine do
+          (feature(:foreman_database) || feature(:candlepin_database)) && \
+            (file_exists?('/var/lib/pgsql') && \
+            file_exists?('/var/opt/rh/rh-postgresql12'))
+        end
+      end
+
+      def run
+        assert(psql_12_available_space >= psql_9_consumed_space, warning_message, :warn => true)
+      end
+
+      def pgsql_dir(version)
+        if version == 9
+          '/var/lib/pgsql/'
+        elsif version == 12
+          '/var/opt/rh/rh-postgresql12/'
+        end
+      end
+
+      def psql_9_consumed_space
+        io_obj = ForemanMaintain::Utils::Disk::IODevice.new(pgsql_dir(9))
+        io_obj.space_used
+      end
+
+      def psql_12_available_space
+        io_obj = ForemanMaintain::Utils::Disk::IODevice.new(pgsql_dir(12))
+        io_obj.available_space
+      end
+
+      def warning_message
+        sat_version = feature(:satellite).current_version.version[0..2]
+        "Satellite #{sat_version} uses PostgreSQL 12. \nThis changes PostgreSQL "\
+        "work directory to #{pgsql_dir(12)}\n"\
+        "The new work directory requires at least #{psql_9_consumed_space}"\
+        'MiB free space for upgrade!'
+      end
+    end
+  end
+end

data/definitions/checks/non_rh_packages.rb

@@ -0,0 +1,34 @@
+class Checks::NonRhPackages < ForemanMaintain::Check
+  metadata do
+    label :non_rh_packages
+    description 'Check if system has any non Red Hat RPMs installed (e.g.: Fedora)'
+    tags :pre_upgrade
+    confine do
+      feature(:instance).downstream
+    end
+  end
+
+  def run
+    rpm_query_format = '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH} : %{VENDOR}\n'
+    all_packages = package_manager.list_installed_packages(rpm_query_format)
+    non_rh_packages = all_packages - \
+                      all_packages.grep(Regexp.union(rh_regexp_list + ansible_runner_regexp_list))
+    assert(non_rh_packages.empty?, error_msg(non_rh_packages), :warn => true)
+  end
+
+  def error_msg(packages)
+    "Found #{packages.count} unexpected non Red Hat Package(s) installed!\
+    \nPackage : Vendor\n#{packages.join("\n")}"
+  end
+
+  def rh_regexp_list
+    [/Red Hat, Inc\./, /Red Hat Inc./, /-apache/, /-foreman-proxy/, /-foreman-client/,
+     /-puppet-client/, /-qpid-broker/, /-qpid-client-cert/, /-qpid-router-client/,
+     /-qpid-router-server/, /java-client/, /pulp-client/, /katello-default-ca/, /katello-server-ca/,
+     /katello-ca-consumer/, /gpg-pubkey/, /-tomcat/]
+  end
+
+  def ansible_runner_regexp_list
+    [/ansible-runner/, /[python\d]+-ansible-runner/]
+  end
+end

data/definitions/checks/services_up.rb

@@ -6,7 +6,9 @@ class Checks::ServicesUp < ForemanMaintain::Check
   end
 
   def run
-    failed_services = feature(:service).existing_services.reject(&:running?)
+    all_services = feature(:service).existing_services
+    failed_services = feature(:service).filter_disabled_services!('status', all_services).
+                      reject(&:running?)
     restart_procedure = Procedures::Service::Restart.new(
       :only => failed_services,
       :wait_for_server_response => true

data/definitions/features/dynflow_sidekiq.rb

@@ -37,6 +37,6 @@ class Features::DynflowSidekiq < ForemanMaintain::Feature
   end
 
   def configured_instances
-    Dir['/etc/foreman/dynflow/*'].map { |config| File.basename(config, '.yml') }
+    Dir['/etc/foreman/dynflow/*.yml'].map { |config| File.basename(config, '.yml') }
   end
 end

data/definitions/features/foreman_proxy.rb

@@ -28,10 +28,11 @@ class Features::ForemanProxy < ForemanMaintain::Feature
   end
 
   def services
-    [
-      system_service('smart_proxy_dynflow_core', 20),
-      system_service('foreman-proxy', 40)
-    ]
+    services = [system_service('foreman-proxy', 40)]
+    if check_max_version('foreman-proxy', '2.4')
+      services << system_service('smart_proxy_dynflow_core', 20)
+    end
+    services
   end
 
   def features

data/definitions/features/katello.rb

@@ -16,9 +16,14 @@ class Features::Katello < ForemanMaintain::Feature
   end
 
   def services
-    [
-      system_service('elasticsearch', 30)
-    ]
+    if feature(:pulp2)
+      []
+    else
+      [
+        system_service('qpidd', 10),
+        system_service('qdrouterd', 10)
+      ]
+    end
   end
 
   # rubocop:disable  Metrics/MethodLength

data/definitions/features/pulp2.rb

@@ -5,7 +5,7 @@ class Features::Pulp < ForemanMaintain::Feature
     label :pulp2
 
     confine do
-      find_package('pulp-server')
+      find_package('pulp-server') && !check_min_version('katello-common', '4.0')
     end
   end
 
@@ -34,4 +34,10 @@ class Features::Pulp < ForemanMaintain::Feature
       '/etc/default/pulp_workers'
     ]
   end
+
+  def exclude_from_backup
+    # Exclude /var/lib/pulp/katello-export and /var/lib/pulp/cache
+    # since the tar is run from /var/lib/pulp, list subdir paths only
+    ['katello-export', 'cache']
+  end
 end

data/definitions/features/service.rb

@@ -25,9 +25,10 @@ class Features::Service < ForemanMaintain::Feature
       select(&:exist?)
   end
 
-  def filtered_services(options)
+  def filtered_services(options, action = '')
     services = include_unregistered_services(existing_services, options[:include])
-    services = filter_services(services, options)
+    services = filter_services(services, options, action)
+
     raise 'No services found matching your parameters' unless services.any?
     return services unless options[:reverse]
 
@@ -42,6 +43,13 @@ class Features::Service < ForemanMaintain::Feature
     action_word_modified(action) + 'ed'
   end
 
+  def filter_disabled_services!(action, service_list)
+    if %w[start stop restart status].include?(action)
+      service_list.select!(&:enabled?)
+    end
+    service_list
+  end
+
   private
 
   def use_system_service(action, options, spinner)
@@ -61,7 +69,7 @@ class Features::Service < ForemanMaintain::Feature
   def run_action_on_services(action, options, spinner)
     status = 0
     failed_services = []
-    filtered_services(options).each_value do |group|
+    filtered_services(options, action).each_value do |group|
       fork_threads_for_services(action, group, spinner).each do |service, status_and_output|
         spinner.update("#{action_noun(action)} #{service}") if action == 'status'
         item_status, output = status_and_output
@@ -115,7 +123,8 @@ class Features::Service < ForemanMaintain::Feature
     service_list + socket_list
   end
 
-  def filter_services(service_list, options)
+  # rubocop:disable Metrics/AbcSize
+  def filter_services(service_list, options, action)
     if options[:only] && options[:only].any?
       service_list = service_list.select do |service|
         options[:only].any? { |opt| service.matches?(opt) }
@@ -128,8 +137,10 @@ class Features::Service < ForemanMaintain::Feature
     end
 
     service_list = extend_service_list_with_sockets(service_list, options)
+    service_list = filter_disabled_services!(action, service_list)
     service_list.group_by(&:priority).to_h
   end
+  # rubocop:enable Metrics/AbcSize
 
   def include_unregistered_services(service_list, services_filter)
     return service_list unless services_filter

data/definitions/procedures/backup/pulp.rb

@@ -30,7 +30,7 @@ module Procedures::Backup
       feature(:tar).run(
         :archive => File.join(@backup_dir, 'pulp_data.tar'),
         :command => 'create',
-        :exclude => ['var/lib/pulp/katello-export'],
+        :exclude => feature(:pulp2).exclude_from_backup,
         :listed_incremental => File.join(@backup_dir, '.pulp.snar'),
         :transform => 's,^,var/lib/pulp/,S',
         :volume_size => @tar_volume_size,

data/definitions/procedures/content/switchover.rb

@@ -19,8 +19,11 @@ module Procedures::Content
       puts execute!('foreman-rake katello:pulp3_content_switchover')
       puts 'Re-running the installer to switch specified content over to pulp3'
       args = ['--foreman-proxy-content-proxy-pulp-isos-to-pulpcore=true',
+              '--foreman-proxy-content-proxy-pulp-yum-to-pulpcore=true',
+              '--foreman-proxy-content-proxy-pulp-deb-to-pulpcore=true',
               '--katello-use-pulp-2-for-file=false',
               '--katello-use-pulp-2-for-docker=false',
+              '--katello-use-pulp-2-for-deb=false',
               '--katello-use-pulp-2-for-yum=false']
       feature(:installer).run(args.join(' '))
     end

data/definitions/procedures/prep_6_10_upgrade.rb

@@ -11,11 +11,11 @@ class Procedures::Prep610Upgrade < ForemanMaintain::Procedure
   def run
     puts time_warning
     with_spinner('Updating filesystem permissions for Pulp 3') do |spinner|
-      spinner.update('$ chmod -R g+rwX /var/lib/pulp/content')
+      spinner.update('# chmod -R g=rwX /var/lib/pulp/content')
       FileUtils.chmod_R 'g=rwX', '/var/lib/pulp/content'
-      spinner.update("$ find /var/lib/pulp/content -type d -perm -g-s -exec chmod g+s {} \;")
-      execute!('find /var/lib/pulp/content -type d -perm -g-s -exec chmod g+s {} \;')
-      spinner.update('$ chown -R :pulp /var/lib/pulp/content')
+      spinner.update("# find /var/lib/pulp/content -type d \! -perm -g+s -exec chmod g+s {} +")
+      execute!('find /var/lib/pulp/content -type d \! -perm -g+s -exec chmod g+s {} +')
+      spinner.update('# chgrp -R pulp /var/lib/pulp/content')
       FileUtils.chown_R nil, 'pulp', '/var/lib/pulp/content'
     end
   end

data/definitions/procedures/pulp/remove.rb

@@ -22,26 +22,38 @@ module Procedures::Pulp
       ]
     end
 
+    # rubocop:disable  Metrics/MethodLength
     def pulp_packages
-      [
-        'pulp-server', 'python-pulp-streamer', 'pulp-puppet-plugins',
-        'python-pulp-rpm-common', 'python-pulp-common',
-        'pulp-selinux', 'python-pulp-oid_validation',
-        'python-pulp-puppet-common', 'python-pulp-repoauth',
-        'pulp-rpm-plugins', 'python-blinker', 'python-celery',
-        'python-django', 'python-isodate', 'python-ldap',
-        'python-mongoengine', 'python-nectar', 'python-oauth2',
-        'python-pymongo'
-      ]
+      possible = %w[pulp-admin-client pulp-agent pulp-consumer-client pulp-deb-admin-extensions
+                    pulp-deb-plugins pulp-docker-admin-extensions pulp-docker-plugins
+                    pulp-nodes-admin-extensions pulp-nodes-child pulp-nodes-common
+                    pulp-nodes-consumer-extensions pulp-nodes-parent pulp-ostree-admin-extensions
+                    pulp-ostree-plugins pulp-puppet-admin-extensions
+                    pulp-puppet-consumer-extensions pulp-puppet-handlers pulp-puppet-plugins
+                    pulp-puppet-tools pulp-python-admin-extensions pulp-python-plugins
+                    pulp-rpm-admin-extensions pulp-rpm-consumer-extensions pulp-rpm-handlers
+                    pulp-rpm-plugins pulp-rpm-yumplugins pulp-selinux pulp-server python-bson
+                    python-crane python-isodate python-mongoengine python-nectar
+                    python-pulp-agent-lib python-pulp-bindings python-pulp-client-lib
+                    python-pulp-common python-pulp-deb-common python-pulp-devel
+                    python-pulp-docker-common python-pulp-integrity python-pulp-manifest
+                    python-pulp-oid_validation python-pulp-ostree-common python-pulp-puppet-common
+                    python-pulp-python-common python-pulp-repoauth python-pulp-rpm-common
+                    python-pulp-streamer python-pymongo python-pymongo-gridfs python2-amqp
+                    python2-billiard python2-celery python2-debpkgr python2-django python2-kombu
+                    python2-solv python2-vine pulp-katello]
+
+      @installed_pulp_packages ||= possible.select { |pkg| find_package(pkg) }
+      @installed_pulp_packages
     end
 
     def data_dir_removal_cmds
-      pulp_data_dirs.collect { |dir| "rm -rf #{dir}" }
+      pulp_data_dirs.select { |dir| File.directory?(dir) }.map { |dir| "rm -rf #{dir}" }
     end
 
     def ask_to_proceed(rm_cmds)
       question = "\nWARNING: All pulp2 packages will be removed with the following commands:\n" \
-        "\n# yum remove #{pulp_packages.join('  ')}" \
+        "\n# rpm -e #{pulp_packages.join('  ')}" \
         "\n# yum remove rh-mongodb34-*" \
         "\n\nAll pulp2 data will be removed.\n"
       question += rm_cmds.collect { |cmd| "\n# #{cmd}" }.join
@@ -52,18 +64,18 @@ module Procedures::Pulp
 
     def run
       rm_cmds = data_dir_removal_cmds
-      ask_to_proceed(rm_cmds)
+      ask_to_proceed(rm_cmds) if rm_cmds.any?
 
       remove_pulp
 
       remove_mongo
 
-      delete_pulp_data(rm_cmds)
+      delete_pulp_data(rm_cmds) if rm_cmds.any?
     end
 
     def remove_pulp
       with_spinner('Removing pulp2 packages') do
-        packages_action(:remove, pulp_packages, :assumeyes => true)
+        execute!("rpm -e #{pulp_packages.join('  ')}")
       end
     end
 
@@ -76,9 +88,7 @@ module Procedures::Pulp
     def delete_pulp_data(rm_cmds)
       with_spinner('Deleting pulp2 data directories') do |spinner|
         rm_cmds.each do |cmd|
-          if File.directory?(cmd.split[2])
-            execute!(cmd)
-          end
+          execute!(cmd)
         end
         spinner.update('Done deleting pulp2 data directories')
       end

data/definitions/procedures/restore/regenerate_queues.rb

@@ -2,7 +2,7 @@ module Procedures::Restore
   class RegenerateQueues < ForemanMaintain::Procedure
     metadata do
       advanced_run false
-      description 'Regenerate required activemq and qpidd queues while restoring online backup'
+      description 'Regenerate required activemq and/or qpidd queues while restoring online backup'
       confine do
         feature(:pulp2)
       end
@@ -31,7 +31,7 @@ module Procedures::Restore
 
     def run
       with_spinner('Resetting the queues') do |spinner|
-        regenerate_activemq_queues(spinner)
+        regenerate_activemq_queues(spinner) if feature(:candlepin)
         regenerate_qpidd_queues(spinner)
         spinner.update('Queues created successfully')
       end

data/definitions/procedures/service/base.rb

@@ -16,7 +16,7 @@ module Procedures
       def run_service_action(action, options)
         action_noun = feature(:service).action_noun(action).capitalize
         puts "\n#{action_noun} the following service(s):"
-        services = feature(:service).filtered_services(options)
+        services = feature(:service).filtered_services(options, action)
         print_services(services)
         with_spinner('') do |spinner|
           feature(:service).handle_services(spinner, action, options)

data/definitions/scenarios/upgrade_to_capsule_6_10.rb

@@ -0,0 +1,88 @@
+module Scenarios::Capsule_6_10
+  class Abstract < ForemanMaintain::Scenario
+    def self.upgrade_metadata(&block)
+      metadata do
+        tags :upgrade_scenario
+        confine do
+          feature(:capsule) &&
+            (feature(:capsule).current_minor_version == '6.9' || \
+            ForemanMaintain.upgrade_in_progress == '6.10')
+        end
+        instance_eval(&block)
+      end
+    end
+
+    def target_version
+      '6.10'
+    end
+  end
+
+  class PreUpgradeCheck < Abstract
+    upgrade_metadata do
+      description 'Checks before upgrading to Capsule 6.10'
+      tags :pre_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:pre_upgrade))
+      add_step(Checks::Repositories::Validate.new(:version => '6.10'))
+    end
+  end
+
+  class PreMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures before migrating to Capsule 6.10'
+      tags :pre_migrations
+    end
+
+    def compose
+      add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::Service::Stop.new)
+    end
+  end
+
+  class Migrations < Abstract
+    upgrade_metadata do
+      description 'Migration scripts to Capsule 6.10'
+      tags :migrations
+    end
+
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
+    def compose
+      add_step(Procedures::Repositories::Setup.new(:version => '6.10'))
+      add_step(Procedures::Packages::UnlockVersions.new)
+      add_step(Procedures::Packages::Update.new(:assumeyes => true))
+      add_step_with_context(Procedures::Installer::Upgrade)
+    end
+  end
+
+  class PostMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures after migrating to Capsule 6.10'
+      tags :post_migrations
+    end
+
+    def compose
+      add_step(Procedures::Service::Start.new)
+      add_steps(find_procedures(:post_migrations))
+    end
+  end
+
+  class PostUpgradeChecks < Abstract
+    upgrade_metadata do
+      description 'Checks after upgrading to Capsule 6.10'
+      tags :post_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:post_upgrade))
+    end
+  end
+end

data/definitions/scenarios/upgrade_to_capsule_6_10_z.rb

@@ -0,0 +1,88 @@
+module Scenarios::Capsule_6_10_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.10' || \
+              ForemanMaintain.upgrade_in_progress == '6.10.z')
+        end
+        instance_eval(&block)
+      end
+    end
+
+    def target_version
+      '6.10.z'
+    end
+  end
+
+  class PreUpgradeCheck < Abstract
+    upgrade_metadata do
+      description 'Checks before upgrading to Capsule 6.10.z'
+      tags :pre_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:pre_upgrade))
+      add_step(Checks::Repositories::Validate.new(:version => '6.10'))
+    end
+  end
+
+  class PreMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures before migrating to Capsule 6.10.z'
+      tags :pre_migrations
+    end
+
+    def compose
+      add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::Service::Stop.new)
+    end
+  end
+
+  class Migrations < Abstract
+    upgrade_metadata do
+      description 'Migration scripts to Capsule 6.10.z'
+      tags :migrations
+    end
+
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
+    def compose
+      add_step(Procedures::Repositories::Setup.new(:version => '6.10'))
+      add_step(Procedures::Packages::UnlockVersions.new)
+      add_step(Procedures::Packages::Update.new(:assumeyes => true))
+      add_step_with_context(Procedures::Installer::Upgrade)
+    end
+  end
+
+  class PostMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures after migrating to Capsule 6.10.z'
+      tags :post_migrations
+    end
+
+    def compose
+      add_step(Procedures::Service::Start.new)
+      add_steps(find_procedures(:post_migrations))
+    end
+  end
+
+  class PostUpgradeChecks < Abstract
+    upgrade_metadata do
+      description 'Checks after upgrading to Capsule 6.10.z'
+      tags :post_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:post_upgrade))
+    end
+  end
+end

data/definitions/scenarios/upgrade_to_satellite_6_10.rb

@@ -0,0 +1,90 @@
+module Scenarios::Satellite_6_10
+  class Abstract < ForemanMaintain::Scenario
+    def self.upgrade_metadata(&block)
+      metadata do
+        tags :upgrade_scenario
+        confine do
+          feature(:satellite) &&
+            (feature(:satellite).current_minor_version == '6.9' || \
+            ForemanMaintain.upgrade_in_progress == '6.10')
+        end
+        instance_eval(&block)
+      end
+    end
+
+    def target_version
+      '6.10'
+    end
+  end
+
+  class PreUpgradeCheck < Abstract
+    upgrade_metadata do
+      description 'Checks before upgrading to Satellite 6.10'
+      tags :pre_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:pre_upgrade))
+      add_step(Checks::Foreman::CheckpointSegments)
+      add_step(Checks::Repositories::Validate.new(:version => '6.10'))
+    end
+  end
+
+  class PreMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures before migrating to Satellite 6.10'
+      tags :pre_migrations
+    end
+
+    def compose
+      add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::Service::Stop.new)
+    end
+  end
+
+  class Migrations < Abstract
+    upgrade_metadata do
+      description 'Migration scripts to Satellite 6.10'
+      tags :migrations
+    end
+
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
+    def compose
+      add_step(Procedures::Repositories::Setup.new(:version => '6.10'))
+      add_step(Procedures::Packages::UnlockVersions.new)
+      add_step(Procedures::Packages::Update.new(:assumeyes => true))
+      add_step_with_context(Procedures::Installer::Upgrade)
+      add_step(Procedures::Installer::UpgradeRakeTask)
+    end
+  end
+
+  class PostMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures after migrating to Satellite 6.10'
+      tags :post_migrations
+    end
+
+    def compose
+      add_step(Procedures::Service::Start.new)
+      add_steps(find_procedures(:post_migrations))
+    end
+  end
+
+  class PostUpgradeChecks < Abstract
+    upgrade_metadata do
+      description 'Checks after upgrading to Satellite 6.10'
+      tags :post_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:post_upgrade))
+    end
+  end
+end

data/definitions/scenarios/upgrade_to_satellite_6_10_z.rb

@@ -0,0 +1,89 @@
+module Scenarios::Satellite_6_10_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.10' || \
+            ForemanMaintain.upgrade_in_progress == '6.10.z')
+        end
+        instance_eval(&block)
+      end
+    end
+
+    def target_version
+      '6.10.z'
+    end
+  end
+
+  class PreUpgradeCheck < Abstract
+    upgrade_metadata do
+      description 'Checks before upgrading to Satellite 6.10.z'
+      tags :pre_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:pre_upgrade))
+      add_step(Checks::Repositories::Validate.new(:version => '6.10'))
+    end
+  end
+
+  class PreMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures before migrating to Satellite 6.10.z'
+      tags :pre_migrations
+    end
+
+    def compose
+      add_steps(find_procedures(:pre_migrations))
+      add_step(Procedures::Service::Stop.new)
+    end
+  end
+
+  class Migrations < Abstract
+    upgrade_metadata do
+      description 'Migration scripts to Satellite 6.10.z'
+      tags :migrations
+    end
+
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
+    def compose
+      add_step(Procedures::Repositories::Setup.new(:version => '6.10'))
+      add_step(Procedures::Packages::UnlockVersions.new)
+      add_step(Procedures::Packages::Update.new(:assumeyes => true))
+      add_step_with_context(Procedures::Installer::Upgrade)
+      add_step(Procedures::Installer::UpgradeRakeTask)
+    end
+  end
+
+  class PostMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures after migrating to Satellite 6.10.z'
+      tags :post_migrations
+    end
+
+    def compose
+      add_step(Procedures::Service::Start.new)
+      add_steps(find_procedures(:post_migrations))
+    end
+  end
+
+  class PostUpgradeChecks < Abstract
+    upgrade_metadata do
+      description 'Checks after upgrading to Satellite 6.10.z'
+      tags :post_upgrade_checks
+      run_strategy :fail_slow
+    end
+
+    def compose
+      add_steps(find_checks(:default))
+      add_steps(find_checks(:post_upgrade))
+    end
+  end
+end

data/definitions/scenarios/upgrade_to_satellite_6_8.rb

@@ -28,6 +28,7 @@ module Scenarios::Satellite_6_8
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
       add_step(Checks::Foreman::CheckpointSegments)
+      add_step(Checks::Disk::AvailableSpacePostgresql12)
       add_step(Checks::Repositories::Validate.new(:version => '6.8'))
     end
   end

data/definitions/scenarios/upgrade_to_satellite_6_9.rb

@@ -28,6 +28,7 @@ module Scenarios::Satellite_6_9
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
       add_step(Checks::Foreman::CheckpointSegments)
+      add_step(Checks::Disk::AvailableSpacePostgresql12)
       add_step(Checks::Repositories::Validate.new(:version => '6.9'))
     end
   end

data/lib/foreman_maintain/concerns/base_database.rb

@@ -2,7 +2,7 @@ module ForemanMaintain
   module Concerns
     module BaseDatabase
       def data_dir
-        if check_min_version('foreman', '2.0')
+        if el7? && check_min_version('foreman', '2.0')
           '/var/opt/rh/rh-postgresql12/lib/pgsql/data/'
         else
           '/var/lib/pgsql/data/'

data/lib/foreman_maintain/concerns/downstream.rb

@@ -62,53 +62,51 @@ module ForemanMaintain
 
       def rh_repos(server_version)
         server_version = version(server_version)
-        rh_version_major = ForemanMaintain::Utils::Facter.os_major_release
-        rh_repos = main_rh_repos(rh_version_major)
-
+        rh_repos = main_rh_repos
         server_version_full = "#{server_version.major}.#{server_version.minor}"
-        rh_repos.concat(product_specific_repos(rh_version_major, server_version_full))
-
+        rh_repos.concat(product_specific_repos(server_version_full))
         if server_version > version('6.3')
-          rh_repos << ansible_repo(server_version, rh_version_major)
+          rh_repos << ansible_repo(server_version)
         end
 
         rh_repos
       end
 
-      def ansible_repo(server_version, rh_version_major)
+      def ansible_repo(server_version)
         if server_version >= version('6.8')
-          "rhel-#{rh_version_major}-server-ansible-2.9-rpms"
+          "rhel-#{el_major_version}-server-ansible-2.9-rpms"
         elsif server_version >= version('6.6')
-          "rhel-#{rh_version_major}-server-ansible-2.8-rpms"
+          "rhel-#{el_major_version}-server-ansible-2.8-rpms"
         elsif server_version >= version('6.4')
-          "rhel-#{rh_version_major}-server-ansible-2.6-rpms"
+          "rhel-#{el_major_version}-server-ansible-2.6-rpms"
         end
       end
 
-      # TODO: refactoring
-      def product_specific_repos(rh_version_major, full_version)
+      def product_specific_repos(full_version)
         repos = []
         repos << if ENV['FOREMAN_MAINTAIN_USE_BETA'] == '1'
-                   "rhel-server-#{rh_version_major}-#{package_name}-6-beta-rpms"
+                   "rhel-server-#{el_major_version}-#{package_name}-6-beta-rpms"
                  else
-                   "rhel-#{rh_version_major}-server-#{package_name}-#{full_version}-rpms"
+                   "rhel-#{el_major_version}-server-#{package_name}-#{full_version}-rpms"
                  end
+        repos << puppet4_repo(full_version) unless puppet4_repo(full_version).nil?
+        repos.concat(common_repos(full_version))
+      end
+
+      def puppet4_repo(full_version)
         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"
+          "rhel-#{el_major_version}-server-#{package_name}-tools-6.3-puppet4-rpms"
         end
-
-        repos.concat(common_repos(rh_version_major, full_version))
       end
 
-      def common_repos(rh_version_major, full_version)
+      def common_repos(full_version)
         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"]
+                         ["rhel-#{el_major_version}-server-satellite-maintenance-6-beta-rpms",
+                          "rhel-#{el_major_version}-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"]
+                         ["rhel-#{el_major_version}-server-satellite-maintenance-6-rpms",
+                          "rhel-#{el_major_version}-server-satellite-tools-#{full_version}-rpms"]
                        end
 
         return repos_arrary.first(1) if feature(:satellite)
@@ -116,9 +114,9 @@ module ForemanMaintain
         repos_arrary
       end
 
-      def main_rh_repos(rh_version_major)
-        ["rhel-#{rh_version_major}-server-rpms",
-         "rhel-server-rhscl-#{rh_version_major}-rpms"]
+      def main_rh_repos
+        ["rhel-#{el_major_version}-server-rpms",
+         "rhel-server-rhscl-#{el_major_version}-rpms"]
       end
 
       def version_from_source

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -192,6 +192,31 @@ module ForemanMaintain
           yield current_version
         end
       end
+
+      def os_facts
+        facter = ForemanMaintain::Utils::Facter.path
+        @os_facts ||= JSON.parse(execute("#{facter} -j os"))
+      end
+
+      def el?
+        os_facts['os']['family'] == 'RedHat'
+      end
+
+      def debian?
+        os_facts['os']['family'] == 'Debian'
+      end
+
+      def el7?
+        os_facts['os']['release']['major'] = '7' && el?
+      end
+
+      def el8?
+        os_facts['os']['release']['major'] = '8' && el?
+      end
+
+      def el_major_version
+        return os_facts['os']['release']['major'] if el?
+      end
     end
   end
 end

data/lib/foreman_maintain/package_manager/yum.rb

@@ -71,6 +71,14 @@ module ForemanMaintain::PackageManager
       sys.execute(find_cmd).split("\n")
     end
 
+    def list_installed_packages(queryfm = '%{NAME}-%{VERSION}-%{RELEASE}.%{ARCH}\n')
+      # The queryfm should only include valid tag(s) as per `rpm --querytag` list.
+      # If any special formatting is required with querytag then it should be provided with tag i.e,
+      # querytag = "--%{VENDOR}"
+      # The queryfm string must end with '\n'
+      sys.execute!("rpm -qa --qf '#{queryfm}'").split("\n")
+    end
+
     private
 
     def protector_config

data/lib/foreman_maintain/runner.rb

@@ -15,6 +15,7 @@ module ForemanMaintain
       @reporter = reporter
       @scenarios = Array(scenarios)
       @quit = false
+      @rescue = false
       @last_scenario = nil
       @last_scenario_continuation_confirmed = false
       @exit_code = 0
@@ -29,12 +30,17 @@ module ForemanMaintain
       @assumeyes
     end
 
+    def rescue?
+      @rescue
+    end
+
     def run
       @scenarios.each do |scenario|
         run_scenario(scenario)
         next unless @quit
 
         if @rescue_scenario
+          @rescue = true
           logger.debug('=== Rescue scenario found. Executing ===')
           execute_scenario_steps(@rescue_scenario, true)
         end
@@ -44,10 +50,10 @@ module ForemanMaintain
 
     def run_scenario(scenario)
       return if scenario.steps.empty?
-      raise 'The runner is already in quit state' if quit?
+      raise 'The runner is already in quit state' if quit? && !rescue?
 
       confirm_scenario(scenario)
-      return if quit?
+      return if quit? && !rescue?
 
       execute_scenario_steps(scenario)
     ensure

data/lib/foreman_maintain/utils/disk/io_device.rb

@@ -26,6 +26,10 @@ module ForemanMaintain
           execute!("df #{dir}|awk {'print $5'}|tail -1").to_i
         end
 
+        def space_used
+          convert_kb_to_mb(execute!("du -ks #{dir} | awk {'print $1'}").to_i)
+        end
+
         private
 
         # In fio command, --direct option bypass the cache page

data/lib/foreman_maintain/utils/facter.rb

@@ -13,9 +13,5 @@ module ForemanMaintain::Utils
     def self.path
       FACTER_FILES.find { |path| File.exist?(path) }
     end
-
-    def self.os_major_release
-      execute!("#{path} operatingsystemmajrelease")
-    end
   end
 end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.7.8'.freeze
+  VERSION = '0.8.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.7.8
+  version: 0.8.2
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-03-22 00:00:00.000000000 Z
+date: 2021-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -126,6 +126,7 @@ files:
 - definitions/checks/check_tmout.rb
 - definitions/checks/disk/available_space.rb
 - definitions/checks/disk/available_space_candlepin.rb
+- definitions/checks/disk/available_space_postgresql12.rb
 - definitions/checks/disk/performance.rb
 - definitions/checks/env_proxy.rb
 - definitions/checks/foreman/check_checkpoint_segments.rb
@@ -147,6 +148,7 @@ files:
 - definitions/checks/maintenance_mode/check_consistency.rb
 - definitions/checks/mongo/db_up.rb
 - definitions/checks/mongo/tools_installed.rb
+- definitions/checks/non_rh_packages.rb
 - definitions/checks/original_assets.rb
 - definitions/checks/package_manager/yum/validate_yum_config.rb
 - definitions/checks/pulpcore/db_up.rb
@@ -298,10 +300,14 @@ files:
 - definitions/scenarios/prep_6_10_upgrade.rb
 - definitions/scenarios/restore.rb
 - definitions/scenarios/services.rb
+- definitions/scenarios/upgrade_to_capsule_6_10.rb
+- definitions/scenarios/upgrade_to_capsule_6_10_z.rb
 - definitions/scenarios/upgrade_to_capsule_6_8.rb
 - definitions/scenarios/upgrade_to_capsule_6_8_z.rb
 - definitions/scenarios/upgrade_to_capsule_6_9.rb
 - definitions/scenarios/upgrade_to_capsule_6_9_z.rb
+- definitions/scenarios/upgrade_to_satellite_6_10.rb
+- definitions/scenarios/upgrade_to_satellite_6_10_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
@@ -418,7 +424,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.0.9
 signing_key: 
 specification_version: 4
 summary: Foreman maintenance tool belt