foreman_maintain 1.14.5 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f53d295c4f0818653dc030e5cac7efcdfc80b2ce31ce8e1c068edc2997b1e83d
-  data.tar.gz: 1518000a6ece5919e4e437bc8b702df19345b0740991c333acb8702f60e02d1c
+  metadata.gz: d0da9c377e1a505e2e26e790b3c93dd94f1f98f0c2e3737c0f1a6871258cac94
+  data.tar.gz: 4c7212c07f45f6d03acc727173b8237d5a405326da20a8e5e9a334bceee8b416
 SHA512:
-  metadata.gz: 468c3e686ac6d9fb1772697a16df958d9e65d99dd3d886edbbb2647b5f80abd0ba4e1ee362635d2fb12fb000f0e45eaebbadbf11acc6df7bfa5d13e408642015
-  data.tar.gz: 4a19eea89a7c5760ab4f9f7d2d388bce1b5de4e40fa36a1a8ff61722c8b742ac821c6ce2512203c9dfc074afeeb3a052d143322b2e7a75c066efb614da2f518b
+  metadata.gz: 548f4f675557dcf5d10e803609000531a5b59767a2a694c3458a28a52dc584b190d0bada0711e4e03fbac8ca87fabd2c0f57925c5d008648ce94bd39ffcdb6a4
+  data.tar.gz: 3d98ba266c9d46325293385064a4a67567c98a4cb1f533e67f2100b954df643ccb9fcaee25cbf23a2dd1865584bc26ce7896568e19b9b19281e7dd6edd181198

data/definitions/features/instance.rb

@@ -179,7 +179,6 @@ class Features::Instance < ForemanMaintain::Feature
   def component_features_map
     {
       'candlepin_auth' => %w[candlepin candlepin_database],
-      'candlepin_events' => %w[candlepin candlepin_database],
       'candlepin' => %w[candlepin candlepin_database],
       'pulp3' => %w[pulpcore pulpcore_database],
       'pulp3_content' => %w[pulpcore pulpcore_database],

data/definitions/scenarios/self_upgrade.rb

@@ -4,7 +4,10 @@ module ForemanMaintain::Scenarios
     include ForemanMaintain::Concerns::Versions
 
     def target_version
-      feature(:instance).target_version
+      @target_version ||= begin
+        v = Gem::Version.new(feature(:instance).target_version)
+        "#{v.segments[0]}.#{v.segments[1] + 1}"
+      end
     end
 
     def current_version
@@ -39,19 +42,30 @@ module ForemanMaintain::Scenarios
       true
     end
 
+    def maintain_version
+      @maintain_version ||= feature(:instance).target_version
+    end
+
+    def current_major
+      Gem::Version.new(current_version).segments[0..1].join('.')
+    end
+
+    def upgrade_repo_version
+      Gem::Version.new(current_version).bump.segments[0..1].join('.')
+    end
+
     def req_repos_to_update_pkgs
+      version = upgrade_repo_version
       if use_rhsm?
-        main_rh_repos + [maintenance_repo_id(target_version)]
+        main_rh_repos + [maintenance_repo_id(version)]
       else
-        [maintenance_repo_id(target_version)]
+        [maintenance_repo_id(version)]
       end
     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
+      current_major == maintain_version ||
+        Gem::Version.new(current_version).bump.segments[0..1].join('.') == maintain_version
     end
   end
 
@@ -67,10 +81,10 @@ module ForemanMaintain::Scenarios
       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."
+          "foreman-maintain does not support the installed version of Satellite." \
+          "The currently installed version in #{current_version}," \
+          "while foreman-maintain only supports #{maintain_version}." \
+          "Please install the right version of foreman-maintain."
         )
       end
 

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.14.5'.freeze
+  VERSION = '1.15.0'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.14.5
+  version: 1.15.0
 platform: ruby
 authors:
 - Ivan Nečas
@@ -500,7 +500,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.10
+rubygems_version: 4.0.6
 specification_version: 4
 summary: Foreman maintenance tool belt
 test_files: []