foreman_maintain 0.9.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dcef2fd68b963d566c30be2531b1f09bf71da02eb8cd06e2c280f9d4a6222fc0
-  data.tar.gz: 5a1448015d72fe8e8ae19c73eff430b13387c699689a5dbbdd0b73bbbe49c9f0
+  metadata.gz: bc78f39bf65ff7aa89be6ba1dda201de03f6d9a4b637599e5afd3d489ac4495d
+  data.tar.gz: 5554b12a68af2a4710ef7725d39079fbe7452b280b40b9ebfe0bd23cad058f40
 SHA512:
-  metadata.gz: 348bedd61056cffd63610b9a91d0e8c2a31e3012ec0e41880e05195ae840a61bd14c7d84ea23715cae771272f555b95f05085e4fb1fefc01a4f1a1f84880648d
-  data.tar.gz: 76f1871c0edb9671ec0a45fec272afed10ae05bb9ebab4b92ecc3f7960bb1a7625b9267eba032fb6335fac1e8cc32116047e87dab109fb8745ce37e212399768
+  metadata.gz: d68910821f5bcbdc2267d7fa5201fe348b4f32af27531d15a621567aaef88dc52bfdc17e3fcaf6ec70899514c103d501b785edd2cb6c9100bb50762b7050236e
+  data.tar.gz: bede7c7b5521c991a83ca714fbdc10bee1df94d992daa4d54c142a51717bfae130f2e5ddf4b789f5c34274a0eb766fed0d62b0bd1f09017c14c0a9378402307c

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 directory'
+        label :group_ownership_check_of_pulp_content
+        manual_detection
+      end
+
+      def run
+        group_id = File.stat('/var/lib/pulp/').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/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

@@ -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/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-24 00:00:00.000000000 Z
+date: 2021-12-03 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
@@ -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