foreman_maintain 1.14.5 → 1.16.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f53d295c4f0818653dc030e5cac7efcdfc80b2ce31ce8e1c068edc2997b1e83d
-  data.tar.gz: 1518000a6ece5919e4e437bc8b702df19345b0740991c333acb8702f60e02d1c
+  metadata.gz: 2fbc59722769aa8b7c256a9c19be18a3774f2620555267b4aa7d185404d4849b
+  data.tar.gz: 0c0eec1446182e0b3638b90e75cb1ab7a74183e47c4ba93b27e0e4033c9c4581
 SHA512:
-  metadata.gz: 468c3e686ac6d9fb1772697a16df958d9e65d99dd3d886edbbb2647b5f80abd0ba4e1ee362635d2fb12fb000f0e45eaebbadbf11acc6df7bfa5d13e408642015
-  data.tar.gz: 4a19eea89a7c5760ab4f9f7d2d388bce1b5de4e40fa36a1a8ff61722c8b742ac821c6ce2512203c9dfc074afeeb3a052d143322b2e7a75c066efb614da2f518b
+  metadata.gz: 4370f30e4f5bbbcd103bab4330d4208a4cef93e599b85ca2f990bf674a61e1a86c4b5cf62b4dc0dc74f62ebae1a977dcc4aeacb7b8631ff1015a516b817a95bb
+  data.tar.gz: 48778609cbf309de9abb05ea30b1b5715fe53d639100b8edeb7f1bb83535dee6d80d496886e2f02be5f97dfa3ffb09a0963c8b0a20fcbd35853b1a2b2c27733a

data/definitions/features/foreman_tasks.rb

@@ -1,3 +1,5 @@
+require "etc"
+
 class Features::ForemanTasks < ForemanMaintain::Feature
   MIN_AGE = 30
   TIMEOUT_FOR_TASKS_STATUS = 300
@@ -177,7 +179,13 @@ class Features::ForemanTasks < ForemanMaintain::Feature
       f.write(csv_output)
       f.close
     end
-    execute("bzip2 #{filepath} -c -9 > #{filepath}.bz2")
+
+    # only if pbzip2, use max 8 threads, but at least 1 thread
+    cpu_count = Etc.nprocessors
+    threads = [[cpu_count / 2, 1].max, 8].min
+
+    compressor = system("which pbzip2 >/dev/null 2>&1") ? "pbzip2 -p#{threads}" : "bzip2"
+    execute("nice -n 10 #{compressor} #{filepath} -c -9 > #{filepath}.bz2")
     FileUtils.rm_rf(filepath)
   end
 

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/packages.rb

@@ -106,6 +106,7 @@ module ForemanMaintain::Scenarios
         if Packages.skip_installer_run?(context.get(:packages))
           add_step_with_context(Procedures::Packages::Update,
             :force => true, :warn_on_errors => true)
+          add_step(Procedures::Packages::CheckForReboot)
         else
           unless context.get(:downloadonly)
             add_steps_with_context(
@@ -126,6 +127,7 @@ module ForemanMaintain::Scenarios
             add_step_with_context(Procedures::Packages::LockVersions)
           else
             add_step_with_context(Procedures::Installer::Run)
+            add_step(Procedures::Packages::CheckForReboot)
           end
 
           add_step(Procedures::Packages::LockingStatus)

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.16.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.16.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.16
 specification_version: 4
 summary: Foreman maintenance tool belt
 test_files: []