foreman_maintain 0.9.3 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcef2fd68b963d566c30be2531b1f09bf71da02eb8cd06e2c280f9d4a6222fc0
-  data.tar.gz: 5a1448015d72fe8e8ae19c73eff430b13387c699689a5dbbdd0b73bbbe49c9f0
+  metadata.gz: '092ba2224bd80eeef29cbcc522cf6ef3a438094125e8a4ad87e0c99281fdd251'
+  data.tar.gz: 0f71a35dc5325391b51a9648cd633ccf681eae203dfa9b49e6626e2b1bd6b602
 SHA512:
-  metadata.gz: 348bedd61056cffd63610b9a91d0e8c2a31e3012ec0e41880e05195ae840a61bd14c7d84ea23715cae771272f555b95f05085e4fb1fefc01a4f1a1f84880648d
-  data.tar.gz: 76f1871c0edb9671ec0a45fec272afed10ae05bb9ebab4b92ecc3f7960bb1a7625b9267eba032fb6335fac1e8cc32116047e87dab109fb8745ce37e212399768
+  metadata.gz: 5589f427186e871ca4b0fbaba47ac450962ef2a91f72c33209b2b9f67d1c354e84c9f407cb47b686ef9867a82cbfdbc6360c1e312ba41021bc16fa08fa5e7e0c
+  data.tar.gz: 6f2f77e8fe631dee53dd3e9476868d76063d8f1c4fb4b2533c332ca88ab16af0b587901258fe4ab7558bf9fce942263b5717c7ef2717a7c0ea428de266a36991

data/definitions/checks/check_hotfix_installed.rb

@@ -46,9 +46,11 @@ class Checks::CheckHotfixInstalled < ForemanMaintain::Check
   def installed_packages
     packages = []
     repoquery_cmd = execute!('which repoquery')
-    IO.popen([repoquery_cmd, '-a', '--installed', '--qf', '%{ui_from_repo} %{nvra}']) do |io|
+    query_format = '%{ui_from_repo} %{name}-%{evr}.%{arch}'
+    IO.popen([repoquery_cmd, '-a', '--installed', '--qf', query_format]) do |io|
       io.each do |line|
         repo, pkg = line.chomp.split
+        next if repo.nil? || pkg.nil?
         packages << pkg if /satellite|rhscl/ =~ repo[1..-1].downcase
       end
     end

data/definitions/checks/foreman_proxy/check_tftp_storage.rb

@@ -6,12 +6,12 @@ module Checks::ForemanProxy
       tags :default
       confine do
         feature(:satellite) && feature(:foreman_proxy) &&
-          feature(:foreman_proxy).features.include?('tftp') && non_zero_token_duration?
+          feature(:foreman_proxy).features.include?('tftp')
       end
     end
 
     def run
-      if Dir.exist?(tftp_boot_directory)
+      if non_zero_token_duration? && Dir.exist?(tftp_boot_directory)
         files = old_files_from_tftp_boot
         assert(files.empty?,
                'There are old initrd and vmlinuz files present in tftp',
@@ -29,7 +29,7 @@ module Checks::ForemanProxy
       end.compact
     end
 
-    def self.non_zero_token_duration?
+    def non_zero_token_duration?
       lookup_token_duration != 0
     end
 
@@ -38,13 +38,15 @@ module Checks::ForemanProxy
     end
 
     def token_duration
-      @token_duration ||= self.class.lookup_token_duration
+      @token_duration ||= lookup_token_duration
     end
 
-    def self.lookup_token_duration
+    def lookup_token_duration
       data = feature(:foreman_database). \
              query("select s.value, s.default from settings s \
-                    where category = 'Setting::Provisioning' and name = 'token_duration'")
+                    where category IN ('Setting::Provisioning','Setting') \
+                    and name = 'token_duration'")
+
       YAML.load(data[0]['value'] || data[0]['default'])
     end
   end

data/definitions/checks/pulpcore/group_ownership_check.rb

@@ -0,0 +1,18 @@
+module Checks
+  module Pulpcore
+    class GroupOwnershipCheck < ForemanMaintain::Check
+      metadata do
+        description 'Check the group owner of /var/lib/pulp/content directory'
+        label :group_ownership_check_of_pulp_content
+        manual_detection
+      end
+
+      def run
+        group_id = File.stat('/var/lib/pulp/content/').gid
+        if Etc.getgrgid(group_id).name != 'pulp'
+          fail! "Please run 'foreman-maintain prep-6.10-upgrade' prior to upgrading."
+        end
+      end
+    end
+  end
+end

data/definitions/checks/repositories/check_non_rh_repository.rb

@@ -11,13 +11,18 @@ module Checks::Repositories
 
     def run
       with_spinner('Checking repositories enabled on the system') do
-        assert(!epel_enabled?, 'System is subscribed to non Red Hat repositories')
+        assert(epel_not_enabled?, 'System is subscribed to non Red Hat repositories')
       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)
+    def epel_not_enabled?
+      system_repos = repository_manager.enabled_repos
+      system_repos.each do |repoid, repourl|
+        unless repoid.match(/\bepel\b/i).nil? || repourl.match(/\bepel\b/i).nil?
+          return false
+        end
+      end
+      true
     end
   end
 end

data/definitions/checks/repositories/check_upstream_repository.rb

@@ -14,10 +14,10 @@ class Checks::CheckUpstreamRepository < ForemanMaintain::Check
 
   def run
     with_spinner('Checking for presence of upstream repositories') do
-      enabled_upstream_repos = feature(:system_repos).upstream_repos_ids
-      assert(enabled_upstream_repos.empty?,
-             "System has upstream #{enabled_upstream_repos.join(',')} repositories enabled",
-             :next_steps => Procedures::Repositories::Disable.new(:repos => enabled_upstream_repos))
+      enabled_repo_ids = feature(:upstream_repositories).repoids_and_urls.keys
+      assert(enabled_repo_ids.empty?,
+             "System has upstream #{enabled_repo_ids.join(',')} repositories enabled",
+             :next_steps => Procedures::Repositories::Disable.new(:repos => enabled_repo_ids))
     end
   end
 end

data/definitions/features/upstream_repositories.rb

@@ -0,0 +1,23 @@
+class Features::UpstreamRepositories < ForemanMaintain::Feature
+  metadata do
+    label :upstream_repositories
+    description 'Feature for operations on upstream repositories'
+  end
+
+  def repoids_and_urls
+    repoids_and_urls = {}
+    repository_manager.enabled_repos.each do |repo, url|
+      repo_urls.each do |regex|
+        repoids_and_urls[repo] = url if url =~ regex
+      end
+    end
+    repoids_and_urls
+  end
+
+  private
+
+  def repo_urls
+    [%r{yum.theforeman.org\/*},
+     %r{yum.puppetlabs.com\/*}]
+  end
+end

data/definitions/procedures/pulp/remove.rb

@@ -86,6 +86,8 @@ module Procedures::Pulp
       drop_migrations
 
       delete_pulp_data(rm_cmds) if rm_cmds.any?
+
+      restart_pulpcore_services
     end
 
     def remove_pulp
@@ -168,5 +170,15 @@ module Procedures::Pulp
         spinner.update('Done deleting pulp2 data directories')
       end
     end
+
+    def restart_pulpcore_services
+      with_spinner('Restarting pulpcore services') do |spinner|
+        pulp_services = feature(:pulpcore).services
+
+        feature(:service).handle_services(spinner, 'stop', :only => pulp_services)
+        feature(:service).handle_services(spinner, 'start', :only => pulp_services)
+        spinner.update('Done restarting pulpcore services')
+      end
+    end
   end
 end

data/definitions/procedures/puppet/remove_puppet.rb

@@ -10,15 +10,23 @@ module Procedures::Puppet
     end
 
     def run
-      services = feature(:foreman_server).services + feature(:dynflow_sidekiq).services
-      Procedures::Service::Stop.new(:only => services)
-      execute!('foreman-rake db:migrate VERSION=0 SCOPE=foreman_puppet') if server_with_puppet?
+      stop_applicable_services
+      if server_with_puppet? && feature(:foreman_server)
+        execute!('foreman-rake db:migrate VERSION=0 SCOPE=foreman_puppet')
+      end
       feature(:installer).run(installer_arguments_disabling_puppet.join(' '), :interactive => false)
       packages_action(:remove, packages_to_remove, :assumeyes => true)
     end
 
     private
 
+    def stop_applicable_services
+      services = []
+      services = feature(:foreman_server).services if feature(:foreman_server)
+      services << feature(:dynflow_sidekiq).services if feature(:dynflow_sidekiq)
+      Procedures::Service::Stop.new(:only => services) unless services.empty?
+    end
+
     def server_with_puppet?
       find_package(foreman_plugin_name('foreman_puppet'))
     end

data/definitions/procedures/puppet/remove_puppet_data.rb

@@ -5,7 +5,9 @@ module Procedures::Puppet
     end
 
     def run
-      execute!('foreman-rake purge:puppet')
+      if feature(:foreman_server)
+        execute!('foreman-rake purge:puppet')
+      end
       execute!('rm -r ' + files_to_purge.join(' '))
     end
 

data/definitions/procedures/repositories/backup_enabled_repos.rb

@@ -6,7 +6,7 @@ module Procedures::Repositories
     end
 
     def run
-      enabled_repos_ids = feature(:system_repos).enabled_repos_ids
+      enabled_repos_ids = repository_manager.enabled_repos.keys
       unless enabled_repos_ids.empty?
         backup_dir = File.expand_path(ForemanMaintain.config.backup_dir)
         File.write(File.join(backup_dir, 'enabled_repos.yml'), enabled_repos_ids.to_yaml)

data/definitions/procedures/repositories/disable.rb

@@ -1,12 +1,12 @@
 module Procedures::Repositories
   class Disable < ForemanMaintain::Procedure
     metadata do
-      param :repos, 'List of repositories to disable'
+      param :repos, 'Array of repositories to disable'
       description 'Disable repositories'
     end
     def run
       with_spinner('Disabling repositories') do
-        feature(:system_repos).disable_repos(@repos)
+        repository_manager.disable_repos(@repos)
       end
     end
   end

data/definitions/procedures/repositories/enable.rb

@@ -1,12 +1,12 @@
 module Procedures::Repositories
   class Enable < ForemanMaintain::Procedure
     metadata do
-      param :repos, 'List of repositories to enable'
+      param :repos, 'Array of repositories to enable'
       description 'Enable repositories'
     end
     def run
       with_spinner('Enabling repositories') do
-        feature(:system_repos).enable_repos(@repos)
+        repository_manager.enable_repos(@repos)
       end
     end
   end

data/definitions/scenarios/puppet.rb

@@ -14,6 +14,7 @@ module ForemanMaintain::Scenarios
           add_step(Checks::CheckPuppetCapsules) if server?
           add_step(Procedures::Puppet::RemovePuppet)
           add_step(Procedures::Puppet::RemovePuppetData) if context.get(:remove_data)
+          add_step(Procedures::Service::Restart)
         end
       end
     end

data/definitions/scenarios/self_upgrade.rb

@@ -1,7 +1,7 @@
 module ForemanMaintain::Scenarios
   class SelfUpgradeBase < ForemanMaintain::Scenario
     def enabled_system_repos_id
-      feature(:system_repos).enabled_repos_ids
+      repository_manager.enabled_repos.keys
     end
 
     def enable_repos(repo_ids = stored_enabled_repos_ids)

data/definitions/scenarios/upgrade_to_capsule_7_0.rb

@@ -0,0 +1,89 @@
+module Scenarios::Capsule_7_0
+  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 == '7.0')
+        end
+        instance_eval(&block)
+      end
+    end
+
+    def target_version
+      '7.0'
+    end
+  end
+
+  class PreUpgradeCheck < Abstract
+    upgrade_metadata do
+      description 'Checks before upgrading to Capsule 7.0'
+      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 => '7.0'))
+    end
+  end
+
+  class PreMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures before migrating to Capsule 7.0'
+      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 7.0'
+      tags :migrations
+    end
+
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
+    def compose
+      add_step(Procedures::Repositories::Setup.new(:version => '7.0'))
+      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 7.0'
+      tags :post_migrations
+    end
+
+    def compose
+      add_step(Procedures::RefreshFeatures)
+      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 7.0'
+      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_7_0_z.rb

@@ -0,0 +1,89 @@
+module Scenarios::Capsule_7_0_z
+  class Abstract < ForemanMaintain::Scenario
+    def self.upgrade_metadata(&block)
+      metadata do
+        tags :upgrade_scenario
+        confine do
+          feature(:capsule) &&
+            (feature(:capsule).current_minor_version == '7.0' || \
+              ForemanMaintain.upgrade_in_progress == '7.0.z')
+        end
+        instance_eval(&block)
+      end
+    end
+
+    def target_version
+      '7.0.z'
+    end
+  end
+
+  class PreUpgradeCheck < Abstract
+    upgrade_metadata do
+      description 'Checks before upgrading to Capsule 7.0.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 => '7.0'))
+    end
+  end
+
+  class PreMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures before migrating to Capsule 7.0.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 7.0.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 => '7.0'))
+      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 7.0.z'
+      tags :post_migrations
+    end
+
+    def compose
+      add_step(Procedures::RefreshFeatures)
+      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 7.0.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

@@ -25,6 +25,7 @@ module Scenarios::Satellite_6_10
     end
 
     def compose
+      add_step(Checks::Pulpcore::GroupOwnershipCheck)
       add_step(Checks::Puppet::WarnAboutPuppetRemoval)
       add_step(Checks::CheckForNewerPackages.new(:packages => [foreman_plugin_name('katello'),
                                                                'python3-pulp-2to3-migration'],
@@ -61,13 +62,6 @@ module Scenarios::Satellite_6_10
       context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
     end
 
-    def check_var_lib_pulp
-      group_id = File.stat('/var/lib/pulp/').gid
-      if Etc.getgrgid(group_id).name != 'pulp'
-        raise "Please run 'foreman-maintain prep-6.10-upgrade' prior to upgrading."
-      end
-    end
-
     def pulp3_switchover_steps
       add_step(Procedures::Service::Enable.
           new(:only => Features::Pulpcore.pulpcore_migration_services))
@@ -79,7 +73,6 @@ module Scenarios::Satellite_6_10
     end
 
     def compose
-      check_var_lib_pulp
       unless check_min_version(foreman_plugin_name('katello'), '4.0')
         pulp3_switchover_steps
       end

data/definitions/scenarios/upgrade_to_satellite_7_0.rb

@@ -0,0 +1,93 @@
+module Scenarios::Satellite_7_0
+  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 == '7.0')
+        end
+        instance_eval(&block)
+      end
+    end
+
+    def target_version
+      '7.0'
+    end
+  end
+
+  class PreUpgradeCheck < Abstract
+    upgrade_metadata do
+      description 'Checks before upgrading to Satellite 7.0'
+      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 => '7.0'))
+    end
+  end
+
+  class PreMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures before migrating to Satellite 7.0'
+      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 7.0'
+      tags :migrations
+      run_strategy :fail_fast
+    end
+
+    def set_context_mapping
+      context.map(:assumeyes, Procedures::Installer::Upgrade => :assumeyes)
+    end
+
+    def compose
+      add_step(Procedures::Repositories::Setup.new(:version => '7.0'))
+      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 7.0'
+      tags :post_migrations
+    end
+
+    def compose
+      add_step(Procedures::RefreshFeatures)
+      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 7.0'
+      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_7_0_z.rb

@@ -0,0 +1,90 @@
+module Scenarios::Satellite_7_0_z
+  class Abstract < ForemanMaintain::Scenario
+    def self.upgrade_metadata(&block)
+      metadata do
+        tags :upgrade_scenario
+        confine do
+          feature(:satellite) &&
+            (feature(:satellite).current_minor_version == '7.0' || \
+            ForemanMaintain.upgrade_in_progress == '7.0.z')
+        end
+        instance_eval(&block)
+      end
+    end
+
+    def target_version
+      '7.0.z'
+    end
+  end
+
+  class PreUpgradeCheck < Abstract
+    upgrade_metadata do
+      description 'Checks before upgrading to Satellite 7.0.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 => '7.0'))
+    end
+  end
+
+  class PreMigrations < Abstract
+    upgrade_metadata do
+      description 'Procedures before migrating to Satellite 7.0.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 7.0.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 => '7.0'))
+      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 7.0.z'
+      tags :post_migrations
+    end
+
+    def compose
+      add_step(Procedures::RefreshFeatures)
+      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 7.0.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/lib/foreman_maintain/concerns/downstream.rb

@@ -17,6 +17,10 @@ module ForemanMaintain
         current_version.to_s[/^\d+\.\d+/]
       end
 
+      def repository_manager
+        ForemanMaintain.repository_manager
+      end
+
       # TODO: Modify activation_key changes as per server
       def setup_repositories(version)
         activation_key = ENV['EXTERNAL_SAT_ACTIVATION_KEY']
@@ -26,18 +30,14 @@ module ForemanMaintain
           execute!(%(subscription-manager register #{org_options}\
                       --activationkey #{shellescape(activation_key)} --force))
         else
-          execute!(%(subscription-manager repos --disable '*'))
-          enable_options = rh_repos(version).map { |r| "--enable=#{r}" }.join(' ')
-          execute!(%(subscription-manager repos #{enable_options}))
+          repository_manager.rhsm_disable_repos(['*'])
+          repository_manager.rhsm_enable_repos(rh_repos(version))
         end
       end
 
       def absent_repos(version)
-        all_repo_lines = execute(%(LANG=en_US.utf-8 subscription-manager repos --list 2>&1 | ) +
-                                  %(grep '^Repo ID:')).split("\n")
-        all_repos = all_repo_lines.map { |line| line.split(/\s+/).last }
         repos_required = rh_repos(version)
-        repos_found = repos_required & all_repos
+        repos_found = repos_required & repository_manager.rhsm_list_repos.keys
         repos_required - repos_found
       end
 
@@ -74,21 +74,36 @@ module ForemanMaintain
 
       def ansible_repo(server_version)
         if server_version >= version('6.8')
-          "rhel-#{el_major_version}-server-ansible-2.9-rpms"
+          ansible_version = '2.9'
         elsif server_version >= version('6.6')
-          "rhel-#{el_major_version}-server-ansible-2.8-rpms"
+          ansible_version = '2.8'
         elsif server_version >= version('6.4')
-          "rhel-#{el_major_version}-server-ansible-2.6-rpms"
+          ansible_version = '2.6'
+        end
+
+        if el7?
+          "rhel-#{el_major_version}-server-ansible-#{ansible_version}-rpms"
+        else
+          "ansible-#{ansible_version}-for-rhel-#{el_major_version}-x86_64-rpms"
         end
       end
 
+      def use_beta_repos?
+        ENV['FOREMAN_MAINTAIN_USE_BETA'] == '1'
+      end
+
       def product_specific_repos(full_version)
-        repos = []
-        repos << if ENV['FOREMAN_MAINTAIN_USE_BETA'] == '1'
-                   "rhel-server-#{el_major_version}-#{package_name}-6-beta-rpms"
-                 else
-                   "rhel-#{el_major_version}-server-#{package_name}-#{full_version}-rpms"
-                 end
+        maj_version = full_version[0]
+        repos = if el7? && use_beta_repos?
+                  ["rhel-server-#{el_major_version}-#{package_name}-#{maj_version}-beta-rpms"]
+                elsif el7?
+                  ["rhel-#{el_major_version}-server-#{package_name}-#{full_version}-rpms"]
+                elsif use_beta_repos?
+                  ["#{package_name}-#{maj_version}-beta-for-rhel-#{el_major_version}-x86_64-rpms"]
+                else
+                  ["#{package_name}-#{full_version}-for-rhel-#{el_major_version}-x86_64-rpms"]
+                end
+
         repos << puppet4_repo(full_version) unless puppet4_repo(full_version).nil?
         repos.concat(common_repos(full_version))
       end
@@ -101,22 +116,35 @@ module ForemanMaintain
       end
 
       def common_repos(full_version)
-        repos_arrary = if ENV['FOREMAN_MAINTAIN_USE_BETA'] == '1'
-                         ["rhel-#{el_major_version}-server-satellite-maintenance-6-beta-rpms",
-                          "rhel-#{el_major_version}-server-satellite-tools-6-beta-rpms"]
-                       else
-                         ["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)
-
-        repos_arrary
+        sat_maint_version = if version(full_version) >= version('7.0') && !use_beta_repos?
+                              full_version
+                            else
+                              full_version[0]
+                            end
+
+        # rubocop:disable Metrics/LineLength
+        repos = if el7? && use_beta_repos?
+                  ["rhel-#{el_major_version}-server-satellite-maintenance-#{sat_maint_version}-beta-rpms"]
+                elsif el7?
+                  ["rhel-#{el_major_version}-server-satellite-maintenance-#{sat_maint_version}-rpms"]
+                elsif use_beta_repos?
+                  ["satellite-maintenance-#{sat_maint_version}-beta-for-rhel-#{el_major_version}-x86_64-rpms"]
+                else
+                  ["satellite-maintenance-#{sat_maint_version}-for-rhel-#{el_major_version}-x86_64-rpms"]
+                end
+        # rubocop:enable Metrics/LineLength
+
+        repos
       end
 
       def main_rh_repos
-        ["rhel-#{el_major_version}-server-rpms",
-         "rhel-server-rhscl-#{el_major_version}-rpms"]
+        if el7?
+          ["rhel-#{el_major_version}-server-rpms",
+           "rhel-server-rhscl-#{el_major_version}-rpms"]
+        else
+          ["rhel-#{el_major_version}-for-x86_64-baseos-rpms",
+           "rhel-#{el_major_version}-for-x86_64-appstream-rpms"]
+        end
       end
 
       def version_from_source

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -185,6 +185,10 @@ module ForemanMaintain
         ForemanMaintain.package_manager
       end
 
+      def repository_manager
+        ForemanMaintain.repository_manager
+      end
+
       def ruby_prefix(scl = true)
         if debian?
           'ruby-'

data/lib/foreman_maintain/repository_manager/el.rb

@@ -0,0 +1,85 @@
+module ForemanMaintain::RepositoryManager
+  class El
+    include ForemanMaintain::Concerns::OsFacts
+    include ForemanMaintain::Concerns::SystemHelpers
+
+    def disable_repos(repo_ids)
+      if el7?
+        execute!("yum-config-manager #{config_manager_options(repo_ids, 'disable')}")
+      else
+        execute!("dnf config-manager #{config_manager_options(repo_ids, 'set-disabled')}")
+      end
+    end
+
+    def rhsm_disable_repos(repo_ids)
+      if rhsm_available?
+        execute!(%(subscription-manager repos #{rhsm_options(repo_ids, 'disable')}))
+      else
+        logger.info("subscription-manager is not available.\
+                     Using #{pkg_manager} config manager instead.")
+        disable_repos(repo_ids)
+      end
+    end
+
+    def enable_repos(repo_ids)
+      if el7?
+        execute!("yum-config-manager #{config_manager_options(repo_ids, 'enable')}")
+      else
+        execute!("dnf config-manager #{config_manager_options(repo_ids, 'enable')}")
+      end
+    end
+
+    def rhsm_enable_repos(repo_ids)
+      if rhsm_available?
+        execute!(%(subscription-manager repos #{rhsm_options(repo_ids, 'enable')}))
+      else
+        logger.info("subscription-manager is not available.\
+                     Using #{pkg_manager} config manager instead.")
+        enable_repos(repo_ids)
+      end
+    end
+
+    def rhsm_options(repo_ids, options)
+      repo_ids.map { |r| "--#{options}=#{r}" }.join(' ')
+    end
+
+    def config_manager_options(repo_ids, options)
+      repo_ids_string = if repo_ids.is_a?(Array)
+                          repo_ids.join(',')
+                        else
+                          repo_ids
+                        end
+      format_shell_args("--#{options}" => repo_ids_string)
+    end
+
+    def rhsm_available?
+      @rhsm_available ||= find_package('subscription-manager')
+    end
+
+    def rhsm_list_repos(list_option = '--list')
+      repos = execute(%(LANG=en_US.utf-8 subscription-manager repos #{list_option} 2>&1))
+      return {} if repos.empty?
+
+      hash_of_repoids_urls(repos, /Repo ID|Repo URL/)
+    end
+
+    def pkg_manager
+      package_manager.class.name.split('::').last.downcase
+    end
+
+    def enabled_repos
+      cmd = "#{pkg_manager} repolist enabled -d 6 -e 0 2> /dev/null"
+      repos = execute(cmd)
+      return {} if repos.empty?
+
+      hash_of_repoids_urls(repos, /Repo-id|Repo-baseurl/)
+    end
+
+    def hash_of_repoids_urls(repos, regex)
+      Hash[*repos.split("\n").grep(regex).map do |entry|
+             entry.split(':', 2).last.strip
+           end
+      ]
+    end
+  end
+end

data/lib/foreman_maintain/repository_manager.rb

@@ -0,0 +1,13 @@
+require 'foreman_maintain/repository_manager/el'
+include ForemanMaintain::Concerns::OsFacts
+module ForemanMaintain
+  def self.repository_manager
+    @repository_manager ||= if el?
+                              ForemanMaintain::RepositoryManager::El.new
+                            elsif debian?
+                              raise 'Not implemented!'
+                            else
+                              raise 'No supported repository manager was found'
+                            end
+  end
+end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.9.3'.freeze
+  VERSION = '1.0.3'.freeze
 end

data/lib/foreman_maintain.rb

@@ -40,6 +40,7 @@ module ForemanMaintain
   require 'foreman_maintain/upgrade_runner'
   require 'foreman_maintain/reporter'
   require 'foreman_maintain/package_manager'
+  require 'foreman_maintain/repository_manager'
   require 'foreman_maintain/utils'
   require 'foreman_maintain/error'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 1.0.3
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-24 00:00:00.000000000 Z
+date: 2022-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -169,6 +169,7 @@ files:
 - definitions/checks/original_assets.rb
 - definitions/checks/package_manager/yum/validate_yum_config.rb
 - definitions/checks/pulpcore/db_up.rb
+- definitions/checks/pulpcore/group_ownership_check.rb
 - definitions/checks/puppet/provide_upgrade_guide.rb
 - definitions/checks/puppet/verify_no_empty_cacert_requests.rb
 - definitions/checks/puppet/warn_about_puppet_removal.rb
@@ -213,9 +214,9 @@ files:
 - definitions/features/satellite.rb
 - definitions/features/service.rb
 - definitions/features/sync_plans.rb
-- definitions/features/system_repos.rb
 - definitions/features/tar.rb
 - definitions/features/upstream.rb
+- definitions/features/upstream_repositories.rb
 - definitions/procedures/backup/accessibility_confirmation.rb
 - definitions/procedures/backup/clean.rb
 - definitions/procedures/backup/compress_data.rb
@@ -335,6 +336,8 @@ files:
 - 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_capsule_7_0.rb
+- definitions/scenarios/upgrade_to_capsule_7_0_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
@@ -353,6 +356,8 @@ files:
 - definitions/scenarios/upgrade_to_satellite_6_8_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_9.rb
 - definitions/scenarios/upgrade_to_satellite_6_9_z.rb
+- definitions/scenarios/upgrade_to_satellite_7_0.rb
+- definitions/scenarios/upgrade_to_satellite_7_0_z.rb
 - extras/foreman-maintain.sh
 - extras/foreman_protector/foreman-protector.conf
 - extras/foreman_protector/foreman-protector.py
@@ -411,6 +416,8 @@ files:
 - lib/foreman_maintain/procedure.rb
 - lib/foreman_maintain/reporter.rb
 - lib/foreman_maintain/reporter/cli_reporter.rb
+- lib/foreman_maintain/repository_manager.rb
+- lib/foreman_maintain/repository_manager/el.rb
 - lib/foreman_maintain/runner.rb
 - lib/foreman_maintain/runner/execution.rb
 - lib/foreman_maintain/runner/stored_execution.rb

data/definitions/features/system_repos.rb

@@ -1,58 +0,0 @@
-class Features::SystemRepos < ForemanMaintain::Feature
-  metadata do
-    label :system_repos
-    description 'Feature for operations on yum repositories of system'
-  end
-
-  def upstream_repos
-    repositories = {}
-    enabled_repos_hash.each do |repo, url|
-      upstream_repo_urls.each do |regex|
-        repositories[repo] = url if url =~ regex
-      end
-    end
-    repositories
-  end
-
-  def enabled_repos_hash
-    repos = execute("yum repolist enabled -d 6 -e 0 2> /dev/null | grep -E 'Repo-id|Repo-baseurl'")
-    return {} if repos.empty?
-
-    Hash[*repos.delete!(' ').split("\n")]
-  end
-
-  def enabled_repos_ids
-    trim_repoids(enabled_repos_hash.keys)
-  end
-
-  def upstream_repos_ids
-    trim_repoids(upstream_repos.keys)
-  end
-
-  def disable_repos(repo_ids)
-    execute!("yum-config-manager --disable #{repo_ids.join(',')}")
-  end
-
-  def enable_repos(repo_ids)
-    execute!("yum-config-manager --enable #{repo_ids.join(',')}")
-  end
-
-  private
-
-  def trim_repoids(repos)
-    repos.map { |r| r.gsub(%r{Repo-id:|\/+\w*}, '') }
-  end
-
-  def upstream_repo_urls
-    repo_urls = { :Foreman => %r{yum.theforeman.org\/},
-                  :Katello => %r{fedorapeople.org\/groups\/katello\/releases\/yum\/[\/|\w|.]*} }
-    [/#{repo_urls[:Foreman]}+releases/,
-     /#{repo_urls[:Foreman]}+plugins/,
-     /#{repo_urls[:Katello]}+katello/,
-     /#{repo_urls[:Katello]}+client/,
-     /#{repo_urls[:Katello]}+candlepin/,
-     /#{repo_urls[:Katello]}+pulp/,
-     %r{yum.puppetlabs.com\/el\/[\w|\/|\.]*\/x86_64},
-     %r{repos.fedorapeople.org\/repos\/pulp\/[\/|\w|.]*\/x86_64}]
-  end
-end