foreman_maintain 1.14.3 → 1.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8971bf9bea6cfdf4e123cbf5926859884bde1665d7e6e56f80b38598a1ec737
-  data.tar.gz: 0d02271818e046de3a240b569a3667da31101caf3efed94e3c4ccd71be8e94ed
+  metadata.gz: d0da9c377e1a505e2e26e790b3c93dd94f1f98f0c2e3737c0f1a6871258cac94
+  data.tar.gz: 4c7212c07f45f6d03acc727173b8237d5a405326da20a8e5e9a334bceee8b416
 SHA512:
-  metadata.gz: 2390f8699745ed38eeef34fa8bf3891a5af7e7ca99d871aef1ac5efb5c45181c3112efae2db349770b8158ebb310331423ee408e5e48af3acf2e47ca34fb77f9
-  data.tar.gz: f3f9118b726d82f5b6a217495b179a522cfbec6a4eb86a45cc4907107153ea8fe6bc232b7129a04f7e02836adfe0d0d4be562081e271527e2f5b8d6beb1bf799
+  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/procedures/pulpcore/rpm_datarepair.rb

@@ -3,14 +3,20 @@ module Procedures::Pulpcore
     include ForemanMaintain::Concerns::PulpCommon
 
     metadata do
-      description 'Rename ContentArtifact relative_paths to match `{N-V-R.A.rpm}`'
+      description 'Run Pulp RPM data repair commands'
       for_feature :pulpcore
     end
 
     def run
-      with_spinner('Running pulpcore-manager rpm-datarepair 4073') do
-        # Assumption: services are already started
-        execute!(pulpcore_manager('rpm-datarepair 4073'))
+      # Fix package_signing_fingerprint empty strings (SAT-42632 / PULP-1263)
+      # Do not fail if unavailable
+      with_spinner('Running pulpcore-manager rpm-datarepair 4007') do |spinner|
+        exit_status, output = execute_with_status(pulpcore_manager('rpm-datarepair 4007'))
+        if exit_status != 0 && output.include?("Unknown issue: '4007'")
+          spinner.update('Skipped pulpcore-manager rpm-datarepair 4007, not available')
+        elsif exit_status != 0
+          fail!(output)
+        end
       end
     end
   end

data/definitions/scenarios/satellite_upgrade.rb

@@ -116,6 +116,7 @@ module Scenarios::Satellite
       add_steps(
         Procedures::RefreshFeatures,
         Procedures::Service::Start,
+        Procedures::Pulpcore::RpmDatarepair,
         Procedures::Crond::Start,
         Procedures::Timer::Start,
         Procedures::SyncPlans::Enable,

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/utils/report_condenser.rb

@@ -3,7 +3,7 @@ module ForemanMaintain::Utils
     class << self
       def condense_report(data)
         result = {}
-        %w[advisor_on_prem_remediations_count rhel_ai_workload_host_count].each do |key|
+        %w[iop_remediations_count rhel_ai_workload_host_count].each do |key|
           result[key] = data[key] || 0
         end
         result.merge!(aggregate_host_count(data))

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.14.3'.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.3
+  version: 1.15.0
 platform: ruby
 authors:
 - Ivan Nečas