foreman_maintain 1.6.8 → 1.6.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 693bf5fa41d37437188c4990278301d1965819e37fad7b0dc680e1fdff8f8631
-  data.tar.gz: d56694b7ed8093eeaa814fdf950f5c308d76eeffbf97a654ecbb20ef55611759
+  metadata.gz: cdd4ef357f342501b15fbaf461be19952c2d09fde6fb7c1f3523711201ef3faa
+  data.tar.gz: cc9b2d323a171c5676276767f11c4a83adc5123fab01f58114d88a80a3ddba13
 SHA512:
-  metadata.gz: 40503012245738da00890d0d224141754f00c110f9bbc7c62112b3e11bea7beb066718bfffdc36056ae9afbed29f2ac8ca6d9dd474e4af9a1eee50099a636352
-  data.tar.gz: d71cfc02366e99a507f1453706d0ffcfe01f1dcdb8cf231a03a4b8468716f1c4b3ae25acfa5938f32858bf17fb37d974d511173b047808b84a03e8dd38ce1d1a
+  metadata.gz: fffefa90d5f28514280c732cb232003acb543420a9ca9fd5a9cf77749beecb1533a05d71bb6b7c5db1e3e06dcb5909a5fa3e8f85ef3a98ae369f090cef84c052
+  data.tar.gz: cb4997dcbb7eba53f9e4d82445ad327316e3a1ace686e62ffd0b3f4a63ecd418542d73c42d7fe10692fb48054dc902b42faaff2772c744e91c421160210fec13

data/definitions/features/foreman_install.rb

@@ -9,4 +9,16 @@ class Features::ForemanInstall < ForemanMaintain::Feature
       !feature(:instance).downstream && feature(:foreman_server)
     end
   end
+
+  def target_version
+    '3.11'
+  end
+
+  def current_version
+    @current_version ||= package_version(package_name)
+  end
+
+  def package_name
+    'foreman'
+  end
 end

data/definitions/features/instance.rb

@@ -91,6 +91,24 @@ class Features::Instance < ForemanMaintain::Feature
     feature(:foreman_install) || feature(:katello_install)
   end
 
+  def current_version
+    version = if feature(:instance).downstream
+                feature(:instance).downstream.current_version
+              else
+                feature(:foreman_install).current_version
+              end
+
+    version.to_s[/^\d+\.\d+\.\d+/]
+  end
+
+  def target_version
+    if feature(:instance).downstream
+      Features::Satellite.new.target_version
+    else
+      Features::ForemanInstall.new.target_version
+    end
+  end
+
   private
 
   # rubocop:disable Metrics/AbcSize

data/definitions/features/satellite.rb

@@ -10,6 +10,10 @@ class Features::Satellite < ForemanMaintain::Feature
     end
   end
 
+  def target_version
+    '6.16'
+  end
+
   def current_version
     @current_version ||= package_version(package_name) || version_from_source
   end

data/definitions/procedures/installer/upgrade_rake_task.rb

@@ -2,12 +2,13 @@ module Procedures::Installer
   class UpgradeRakeTask < ForemanMaintain::Procedure
     metadata do
       description 'Execute upgrade:run rake task'
+      confine do
+        feature(:satellite)
+      end
     end
 
     def run
-      # only run this in the Satellite scenario, as in others
-      # the installer runs this rake task for us already
-      execute!('foreman-rake upgrade:run') if feature(:satellite)
+      execute!('foreman-rake upgrade:run')
     end
   end
 end

data/definitions/scenarios/restore.rb

@@ -35,7 +35,7 @@ module ForemanMaintain::Scenarios
       add_step_with_context(Procedures::Service::Stop)
       add_steps_with_context(Procedures::Restore::ExtractFiles) if backup.tar_backups_exist?
 
-      if backup.sql_dump_files_exist?
+      if backup.sql_needs_dump_restore?
         add_steps_with_context(Procedures::Restore::DropDatabases)
         restore_sql_dumps(backup)
       end

data/definitions/scenarios/{upgrade_to_satellite_6_16.rb → satellite_upgrade.rb}

@@ -1,11 +1,10 @@
-module Scenarios::Satellite_6_16
+module Scenarios::Satellite
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
         tags :upgrade_scenario
         confine do
-          feature(:satellite) &&
-            (feature(:satellite).current_minor_version == '6.15' || \
+          (feature(:downstream).current_minor_version == '6.15' || \
             ForemanMaintain.upgrade_in_progress == '6.16')
         end
         instance_eval(&block)
@@ -19,7 +18,7 @@ module Scenarios::Satellite_6_16
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Satellite 6.16'
+      description 'Checks before upgrading'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -29,14 +28,14 @@ module Scenarios::Satellite_6_16
       add_steps(find_checks(:pre_upgrade))
       add_step(Checks::CheckIpv6Disable)
       add_step(Checks::Disk::AvailableSpacePostgresql13)
-      add_step(Checks::Repositories::Validate.new(:version => '6.16'))
+      add_step(Checks::Repositories::Validate.new(:version => target_version))
       add_step(Checks::CheckOrganizationContentAccessMode)
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Satellite 6.16'
+      description 'Procedures before migrating'
       tags :pre_migrations
     end
 
@@ -47,7 +46,7 @@ module Scenarios::Satellite_6_16
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Satellite 6.16'
+      description 'Migration scripts'
       tags :migrations
       run_strategy :fail_fast
     end
@@ -57,7 +56,7 @@ module Scenarios::Satellite_6_16
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
+      add_step(Procedures::Repositories::Setup.new(:version => target_version))
       if el8?
         modules_to_switch = ['postgresql:13']
         add_step(Procedures::Packages::SwitchModules.new(:module_names => modules_to_switch))
@@ -77,7 +76,7 @@ module Scenarios::Satellite_6_16
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Satellite 6.16'
+      description 'Procedures after migrating'
       tags :post_migrations
     end
 
@@ -90,7 +89,7 @@ module Scenarios::Satellite_6_16
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Satellite 6.16'
+      description 'Checks after upgrading'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/definitions/scenarios/self_upgrade.rb

@@ -4,11 +4,11 @@ module ForemanMaintain::Scenarios
     include ForemanMaintain::Concerns::Versions
 
     def target_version
-      @target_version ||= Gem::Version.new(current_version).bump.to_s
+      feature(:instance).target_version
     end
 
     def current_version
-      feature(:instance).downstream.current_version.to_s[/^\d+\.\d+\.\d+/]
+      feature(:instance).current_version
     end
 
     def maintenance_repo_label
@@ -47,12 +47,11 @@ module ForemanMaintain::Scenarios
       end
     end
 
-    def upstream_target_version
-      if feature(:katello_install)
-        return foreman_version_by_katello(target_version)
-      else
-        target_version
-      end
+    def self_upgrade_allowed?
+      target = Gem::Version.new(target_version).version
+
+      Gem::Version.new(current_version).segments[0..1].join('.') == target ||
+        Gem::Version.new(current_version).bump.segments[0..1].join('.') == target
     end
   end
 
@@ -65,6 +64,16 @@ module ForemanMaintain::Scenarios
     end
 
     def downstream_self_upgrade(pkgs_to_update)
+      unless self_upgrade_allowed?
+        raise(
+          ForemanMaintain::Error::Warn,
+          "foreman-maintain is too many versions ahead. The target " \
+          "version is #{target_version} while the currently installed " \
+          "version is #{current_version}. Please rollback " \
+          "foreman-maintain to the proper version."
+        )
+      end
+
       ForemanMaintain.enable_maintenance_module
 
       add_step(Procedures::Packages::Update.new(packages: pkgs_to_update, assumeyes: true,
@@ -77,7 +86,7 @@ module ForemanMaintain::Scenarios
       # 2. Update the foreman-maintain packages from next major version repository
       # 3. Rollback the repository to current major version
 
-      add_step(Procedures::Repositories::Setup.new(:version => upstream_target_version))
+      add_step(Procedures::Repositories::Setup.new(:version => target_version))
       add_step(Procedures::Packages::Update.new(packages: pkgs_to_update, assumeyes: true))
     ensure
       rollback_repositories

data/lib/foreman_maintain/cli/upgrade_command.rb

@@ -74,21 +74,10 @@ module ForemanMaintain
         interactive_option
         disable_self_upgrade_option
 
-        option '--phase', 'phase', 'run only a specific phase', :required => false do |phase|
-          unless UpgradeRunner::PHASES.include?(phase.to_sym)
-            raise Error::UsageError, "Unknown phase #{phase}"
-          end
-          phase
-        end
-
         def execute
           ForemanMaintain.validate_downstream_packages
           ForemanMaintain.perform_self_upgrade if allow_self_upgrade?
-          if phase
-            upgrade_runner.run_phase(phase.to_sym)
-          else
-            upgrade_runner.run
-          end
+          upgrade_runner.run
           upgrade_runner.save
           exit upgrade_runner.exit_code
         end

data/lib/foreman_maintain/utils/backup.rb

@@ -223,12 +223,20 @@ module ForemanMaintain
           file_map[:pgsql_data][:present]
       end
 
+      def sql_tar_files_exist?
+        file_map[:pgsql_data][:present]
+      end
+
       def sql_dump_files_exist?
         file_map[:foreman_dump][:present] ||
           file_map[:candlepin_dump][:present] ||
           file_map[:pulpcore_dump][:present]
       end
 
+      def sql_needs_dump_restore?
+        !sql_tar_files_exist? && sql_dump_files_exist?
+      end
+
       def incremental?
         !!metadata.fetch('incremental', false)
       end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.6.8'.freeze
+  VERSION = '1.6.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.6.8
+  version: 1.6.9
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-06-06 00:00:00.000000000 Z
+date: 2024-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -313,11 +313,10 @@ files:
 - definitions/scenarios/packages.rb
 - definitions/scenarios/puppet.rb
 - definitions/scenarios/restore.rb
+- definitions/scenarios/satellite_upgrade.rb
 - definitions/scenarios/self_upgrade.rb
 - definitions/scenarios/services.rb
 - definitions/scenarios/update.rb
-- definitions/scenarios/upgrade_to_capsule_6_16.rb
-- definitions/scenarios/upgrade_to_satellite_6_16.rb
 - extras/foreman-maintain.sh
 - extras/foreman_protector/dnf/foreman-protector.py
 - extras/foreman_protector/foreman-protector.conf

data/definitions/scenarios/upgrade_to_capsule_6_16.rb

@@ -1,102 +0,0 @@
-module Scenarios::Capsule_6_16
-  class Abstract < ForemanMaintain::Scenario
-    def self.upgrade_metadata(&block)
-      metadata do
-        tags :upgrade_scenario
-        confine do
-          feature(:capsule) &&
-            (feature(:capsule).current_minor_version == '6.15' || \
-            ForemanMaintain.upgrade_in_progress == '6.16')
-        end
-        instance_eval(&block)
-      end
-    end
-
-    def target_version
-      '6.16'
-    end
-  end
-
-  class PreUpgradeCheck < Abstract
-    upgrade_metadata do
-      description 'Checks before upgrading to Capsule 6.16'
-      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::CheckIpv6Disable)
-      add_step(Checks::Disk::AvailableSpacePostgresql13)
-      add_step(Checks::Repositories::Validate.new(:version => '6.16'))
-    end
-  end
-
-  class PreMigrations < Abstract
-    upgrade_metadata do
-      description 'Procedures before migrating to Capsule 6.16'
-      tags :pre_migrations
-    end
-
-    def compose
-      add_steps(find_procedures(:pre_migrations))
-    end
-  end
-
-  class Migrations < Abstract
-    upgrade_metadata do
-      description 'Migration scripts to Capsule 6.16'
-      tags :migrations
-    end
-
-    def set_context_mapping
-      context.map(:assumeyes, Procedures::Installer::Run => :assumeyes)
-    end
-
-    def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.16'))
-      if el8?
-        modules_to_switch = ['postgresql:13']
-        add_step(Procedures::Packages::SwitchModules.new(:module_names => modules_to_switch))
-        modules_to_enable = ["satellite-capsule:#{el_short_name}"]
-        add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable))
-      end
-      add_step(Procedures::Packages::Update.new(
-        :assumeyes => true,
-        :download_only => true
-      ))
-      add_step(Procedures::Service::Stop.new)
-      add_step(Procedures::Packages::Update.new(:assumeyes => true, :clean_cache => false))
-      add_step_with_context(Procedures::Installer::Run)
-    end
-  end
-
-  class PostMigrations < Abstract
-    upgrade_metadata do
-      description 'Procedures after migrating to Capsule 6.16'
-      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 6.16'
-      tags :post_upgrade_checks
-      run_strategy :fail_slow
-    end
-
-    def compose
-      add_steps(find_checks(:default))
-      add_steps(find_checks(:post_upgrade))
-      add_step(Procedures::Packages::CheckForReboot)
-      add_step(Procedures::Pulpcore::ContainerHandleImageMetadata)
-    end
-  end
-end