Run rpm-datarepair 4007 on upgrade

definitions/procedures/pulpcore/rpm_datarepair.rb

@@ -3,14 +3,20 @@ class RpmDatarepair < ForemanMaintain::Procedure
     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

definitions/scenarios/satellite_upgrade.rb

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

test/definitions/procedures/pulpcore/rpm_datarepair_test.rb

@@ -5,15 +5,31 @@
 
   subject { Procedures::Pulpcore::RpmDatarepair.new }
 
-  it 'runs pulpcore-manager rpm-datarepair 4073' do
+  it 'runs rpm-datarepair 4007 when handler exists' do
     assume_feature_present(:pulpcore)
     assume_feature_present(:pulpcore_database, :services => [])
     assume_feature_present(:service)
 
-    subject.expects(:execute!).with(
+    # Mock successful execution of 4007
+    subject.expects(:execute_with_status).with(
       'PULP_SETTINGS=/etc/pulp/settings.py runuser -u pulp -- ' \
-      'pulpcore-manager rpm-datarepair 4073'
-    ).once
+      'pulpcore-manager rpm-datarepair 4007'
+    ).returns([0, ''])
+
+    result = run_procedure(subject)
+    assert result.success?
+  end
+
+  it 'gracefully skips rpm-datarepair 4007 if handler does not exist' do
+    assume_feature_present(:pulpcore)
+    assume_feature_present(:pulpcore_database, :services => [])
+    assume_feature_present(:service)
+
+    # Mock 4007 handler not existing
+    subject.expects(:execute_with_status).with(
+      'PULP_SETTINGS=/etc/pulp/settings.py runuser -u pulp -- ' \
+      'pulpcore-manager rpm-datarepair 4007'
+    ).returns([2, "CommandError: Unknown issue: '4007'"])
 
     result = run_procedure(subject)
     assert result.success?