foreman_maintain 1.7.5 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cd1a7ccb0a384dfbcbde42660854837199df64a4bcf465a3ea92fb77809eff3a
-  data.tar.gz: 54f3cbec98e27261489708521a4cb43a41411cb0c40699a5a04c09c6ec66edb3
+  metadata.gz: 8e99ddc1408ae68f584bbfc6e8798367e623e38f981682666f40cac91bb8f5f4
+  data.tar.gz: 173ee0cd4fbce206437d53937eaf0489111e4c6b57eac8b04943c9468eb5ab40
 SHA512:
-  metadata.gz: a60449b267d0b2e5cf90358b87f0ebebf3987b782fae40fcedcc88472790e4ecca1c2a4d4bf3d92497fb328e56fa792b3b8e8fa5ac05c50866f3f3662b4f31c0
-  data.tar.gz: 3fb5c40f6edac2b69cb455af6c90c9c43a4ec91a0d2e8dca590edf2339931c08c58f239565a601280f9b81a4d5ab4c742ad91740bd96e0a26bab633aaa04cc16
+  metadata.gz: 60a28996480d8564f5900a56d3f1494f9eb756d0a54c1bf3fee4c37fb5096a848db3a4ed2a6700e65d2fd4193bda13bebb4a50368ca0dbfd2ca1dccf9ea76d8e
+  data.tar.gz: c323322a2e40d116c34de3ed7430742caa127250024957aa4b2579b14bbc27fb271312a6d973d82533ef091ca77ead05de0cf61c005475da8e3766e910e35562

data/definitions/features/installer.rb

@@ -8,7 +8,7 @@ class Features::Installer < ForemanMaintain::Feature
   end
 
   def answers
-    load_answers(configuration)
+    YAML.load_file(answer_file)
   end
 
   def configuration
@@ -28,11 +28,13 @@ class Features::Installer < ForemanMaintain::Feature
   end
 
   def config_files
-    Dir.glob(File.join(config_directory, '**/*')) +
-      [
-        '/opt/puppetlabs/puppet/cache/foreman_cache_data',
-        '/opt/puppetlabs/puppet/cache/pulpcore_cache_data',
-      ]
+    paths = [
+      config_directory,
+      '/opt/puppetlabs/puppet/cache/foreman_cache_data',
+      '/opt/puppetlabs/puppet/cache/pulpcore_cache_data',
+    ]
+    paths << answer_file unless answer_file.start_with?("#{config_directory}/")
+    paths
   end
 
   def last_scenario
@@ -80,8 +82,8 @@ class Features::Installer < ForemanMaintain::Feature
 
   private
 
-  def load_answers(config)
-    YAML.load_file(config[:answer_file])
+  def answer_file
+    configuration[:answer_file]
   end
 
   def last_scenario_config

data/definitions/features/pulpcore.rb

@@ -68,8 +68,8 @@ class Features::Pulpcore < ForemanMaintain::Feature
 
   def self.pulpcore_common_services
     [
-      ForemanMaintain::Utils.system_service('pulpcore-api', 10, :socket => 'pulpcore-api'),
-      ForemanMaintain::Utils.system_service('pulpcore-content', 10, :socket => 'pulpcore-content'),
+      ForemanMaintain::Utils.system_service('pulpcore-api', 20, :socket => 'pulpcore-api'),
+      ForemanMaintain::Utils.system_service('pulpcore-content', 20, :socket => 'pulpcore-content'),
     ]
   end
 end

data/definitions/features/satellite.rb

@@ -11,11 +11,11 @@ class Features::Satellite < ForemanMaintain::Feature
   end
 
   def target_version
-    '6.16'
+    satellite_maintain_target_version
   end
 
   def current_version
-    @current_version ||= package_version(package_name) || version_from_source
+    @current_version ||= package_version(package_name)
   end
 
   def package_name
@@ -25,10 +25,4 @@ class Features::Satellite < ForemanMaintain::Feature
   def module_name
     'satellite'
   end
-
-  private
-
-  def version_from_source
-    version(File.read('/usr/share/foreman/lib/satellite/version.rb')[/6\.\d\.\d/])
-  end
 end

data/definitions/scenarios/satellite_upgrade.rb

@@ -4,15 +4,14 @@ module Scenarios::Satellite
       metadata do
         tags :upgrade_scenario
         confine do
-          (feature(:instance).downstream&.current_minor_version == '6.15' || \
-            ForemanMaintain.upgrade_in_progress == '6.16')
+          feature(:instance).downstream&.satellite_upgrade_allowed?
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.16'
+      feature(:instance).downstream&.satellite_maintain_target_version
     end
   end
 

data/lib/foreman_maintain/concerns/downstream.rb

@@ -1,6 +1,8 @@
 module ForemanMaintain
   module Concerns
     module Downstream
+      SATELLITE_MAINTAIN_CONFIG = '/usr/share/satellite-maintain/config.yml'.freeze
+
       def current_version
         raise NotImplementedError
       end
@@ -46,8 +48,25 @@ module ForemanMaintain
         %w[satellite-maintain satellite-maintain]
       end
 
+      def satellite_maintain_target_version
+        satellite_maintain_config['current_satellite_version']
+      end
+
+      def satellite_upgrade_allowed?
+        current_minor_version == satellite_maintain_config['previous_satellite_version'] ||
+          ForemanMaintain.upgrade_in_progress == satellite_maintain_target_version
+      end
+
       private
 
+      def satellite_maintain_config
+        if File.exist?(SATELLITE_MAINTAIN_CONFIG)
+          YAML.load_file(SATELLITE_MAINTAIN_CONFIG)
+        else
+          raise "Could not load satellite-maintain configuration file #{SATELLITE_MAINTAIN_CONFIG}."
+        end
+      end
+
       def rh_repos(server_version)
         server_version = version(server_version)
         rh_repos = main_rh_repos
@@ -71,10 +90,6 @@ module ForemanMaintain
           "rhel-#{el_major_version}-for-x86_64-appstream-rpms",
         ]
       end
-
-      def version_from_source
-        raise NotImplementedError
-      end
     end
   end
 end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.7.5'.freeze
+  VERSION = '1.8.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.7.5
+  version: 1.8.0
 platform: ruby
 authors:
 - Ivan Nečas
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-26 00:00:00.000000000 Z
+date: 2024-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -410,7 +410,7 @@ homepage: https://github.com/theforeman/foreman_maintain
 licenses:
 - GPL-3.0
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -429,7 +429,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.3.27
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Foreman maintenance tool belt
 test_files: []