foreman_maintain 1.1.7 → 1.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 91f6ed30cd64c8a77327a681177355d94c2afc783ebad3c6341353ac1930d2ef
-  data.tar.gz: ae2a2c770198febfeb4037a883b6b03a02498f0e461ce9acf4bc6661ae9ef7e7
+  metadata.gz: 69158577583d9944fc51caf91b42171deb3d44a286fcbca2bced55bf667d80e1
+  data.tar.gz: b30ed55b5b891f6b4e894ca532a14b8543a68a0270f272869230d911655ae478
 SHA512:
-  metadata.gz: 372122b9854841be9b61c16dc4e32456b917348413cca28d5ebb930c1753e456818d70278c4d74da64d9096b092d5ccaced4aac2bfe62d46ec59333f86844c9d
-  data.tar.gz: 170d5f54b55dbbe4e91b7bfca2842d0f9c0f4389844208f558b6944b61e086a7cd7edc378c1a27e37f7d09e5eb326b31c7a96c00daf2807f59cf82596815f8da
+  metadata.gz: a4763f9ee14216abab95da46d04ebe87b2cf8a11ac874204e6a2f0771f97c3a49b0f1a42e88959faf023ea08536e08d0fe4d263625af1329e542697b7f194033
+  data.tar.gz: ffe603fe952c1d1eb010cb9a5c22329b257a0fbb33aed897dc4871cb683e99b8c6fb38e2e1462aa4c16ec5c32943a6f70ecb88b6177c2e420eac7231634a80fa

data/definitions/procedures/pulpcore/trim_rpm_changelogs.rb

@@ -0,0 +1,23 @@
+module Procedures::Pulpcore
+  class TrimRpmChangelogs < ForemanMaintain::Procedure
+    include ForemanMaintain::Concerns::SystemService
+
+    metadata do
+      description 'Trim RPM changelogs in the pulpcore db'
+      for_feature :pulpcore
+    end
+
+    def run
+      with_spinner('Trimming RPM changelogs in the pulpcore db') do |spinner|
+        necessary_services = feature(:pulpcore_database).services
+
+        feature(:service).handle_services(spinner, 'start', :only => necessary_services)
+
+        spinner.update('Trimming RPM changelogs')
+        execute!('sudo PULP_SETTINGS=/etc/pulp/settings.py '\
+          'DJANGO_SETTINGS_MODULE=pulpcore.app.settings '\
+          'pulpcore-manager rpm-trim-changelogs')
+      end
+    end
+  end
+end

data/definitions/scenarios/self_upgrade.rb

@@ -2,11 +2,11 @@ module ForemanMaintain::Scenarios
   class SelfUpgradeBase < ForemanMaintain::Scenario
     include ForemanMaintain::Concerns::Downstream
     def target_version
-      @target_version ||= current_version.bump
+      @target_version ||= Gem::Version.new(current_version).bump.to_s
     end
 
     def current_version
-      feature(:instance).downstream.current_minor_version
+      feature(:instance).downstream.current_version.to_s[/^\d+\.\d+\.\d+/]
     end
 
     def maintenance_repo_label

data/definitions/scenarios/upgrade_to_satellite_6_11.rb

@@ -76,6 +76,7 @@ module Scenarios::Satellite_6_11
     def compose
       add_step(Procedures::RefreshFeatures)
       add_step(Procedures::Service::Start.new)
+      add_step(Procedures::Pulpcore::TrimRpmChangelogs.new)
       add_steps(find_procedures(:post_migrations))
     end
   end

data/definitions/scenarios/upgrade_to_satellite_6_12.rb

@@ -73,6 +73,7 @@ module Scenarios::Satellite_6_12
     def compose
       add_step(Procedures::RefreshFeatures)
       add_step(Procedures::Service::Start.new)
+      add_step(Procedures::Pulpcore::TrimRpmChangelogs.new)
       add_steps(find_procedures(:post_migrations))
     end
   end

data/definitions/scenarios/upgrade_to_satellite_6_12_z.rb

@@ -72,6 +72,7 @@ module Scenarios::Satellite_6_12_z
     def compose
       add_step(Procedures::RefreshFeatures)
       add_step(Procedures::Service::Start.new)
+      add_step(Procedures::Pulpcore::TrimRpmChangelogs.new)
       add_steps(find_procedures(:post_migrations))
     end
   end

data/extras/foreman_protector/foreman-protector.whitelist

@@ -20,7 +20,12 @@ yum-utils
 # el7 psql client dependencies
 rh-postgresql12-postgresql
 rh-postgresql12-postgresql-libs
+rh-postgresql12-postgresql-syspaths
 rh-postgresql12-runtime
+scl-utils
+# el8 psql client dependencies
+postgresql
+libpq
 # el8 yum-utils dependencies
 dnf-plugins-core
 python3-dnf-plugins-core

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.1.7'.freeze
+  VERSION = '1.1.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.9
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2023-01-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -298,6 +298,7 @@ files:
 - definitions/procedures/pulp/print_remove_instructions.rb
 - definitions/procedures/pulp/remove.rb
 - definitions/procedures/pulpcore/migrate.rb
+- definitions/procedures/pulpcore/trim_rpm_changelogs.rb
 - definitions/procedures/puppet/delete_empty_ca_cert_request_files.rb
 - definitions/procedures/puppet/remove_puppet.rb
 - definitions/procedures/puppet/remove_puppet_data.rb
@@ -483,7 +484,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.33
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: Foreman maintenance tool belt