From 057d5b6bd66211e12128885e59b2e1facbd7382f Mon Sep 17 00:00:00 2001 From: Evgeni Golov Date: Thu, 10 Oct 2024 14:07:30 +0200 Subject: [PATCH] move things to yaml --- lib/foreman_maintain/concerns/downstream.rb | 11 +++++++---- test/definitions/scenarios/capsule_upgrade_test.rb | 1 + test/definitions/scenarios/satellite_upgrade_test.rb | 1 + test/definitions/scenarios/self_upgrade_test.rb | 2 ++ test/definitions/scenarios/update_test.rb | 4 ++++ test/definitions/test_helper.rb | 9 +++++++++ 6 files changed, 24 insertions(+), 4 deletions(-) diff --git a/lib/foreman_maintain/concerns/downstream.rb b/lib/foreman_maintain/concerns/downstream.rb index b36ca052e..8c94d763c 100644 --- a/lib/foreman_maintain/concerns/downstream.rb +++ b/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 @@ -58,10 +60,11 @@ def satellite_upgrade_allowed? private def satellite_maintain_config - { - 'current_sat_version' => '6.16', - 'previous_sat_version' => '6.15', - } + if File.exist?(SATELLITE_MAINTAIN_CONFIG) + YAML.load_file(SATELLITE_MAINTAIN_CONFIG) + else + {} + end end def rh_repos(server_version) diff --git a/test/definitions/scenarios/capsule_upgrade_test.rb b/test/definitions/scenarios/capsule_upgrade_test.rb index aeac1ccc7..b1854caf0 100644 --- a/test/definitions/scenarios/capsule_upgrade_test.rb +++ b/test/definitions/scenarios/capsule_upgrade_test.rb @@ -5,6 +5,7 @@ before(:each) do assume_feature_present(:capsule) + mock_satellite_maintain_config end describe Scenarios::Satellite::PreUpgradeCheck do diff --git a/test/definitions/scenarios/satellite_upgrade_test.rb b/test/definitions/scenarios/satellite_upgrade_test.rb index cc0419d71..0002b9292 100644 --- a/test/definitions/scenarios/satellite_upgrade_test.rb +++ b/test/definitions/scenarios/satellite_upgrade_test.rb @@ -5,6 +5,7 @@ before(:each) do assume_satellite_present + mock_satellite_maintain_config end describe Scenarios::Satellite::Abstract do diff --git a/test/definitions/scenarios/self_upgrade_test.rb b/test/definitions/scenarios/self_upgrade_test.rb index a5077be55..6984323e9 100644 --- a/test/definitions/scenarios/self_upgrade_test.rb +++ b/test/definitions/scenarios/self_upgrade_test.rb @@ -7,6 +7,7 @@ before do File.stubs(:exist?).with('/etc/redhat-release').returns(true) + mock_satellite_maintain_config end let(:scenario) do @@ -59,6 +60,7 @@ before do File.stubs(:exist?).with('/etc/redhat-release').returns(true) + mock_satellite_maintain_config end it 'runs successfully for downstream Satellite' do diff --git a/test/definitions/scenarios/update_test.rb b/test/definitions/scenarios/update_test.rb index 39b9700e5..ef7376499 100644 --- a/test/definitions/scenarios/update_test.rb +++ b/test/definitions/scenarios/update_test.rb @@ -3,6 +3,10 @@ describe "update scenarios" do include DefinitionsTestHelper + before(:each) do + mock_satellite_maintain_config + end + it 'runs if versions match' do assume_satellite_present Features::Instance.any_instance.expects(:current_version).returns('6.16') diff --git a/test/definitions/test_helper.rb b/test/definitions/test_helper.rb index 0099aff5c..652980a3a 100644 --- a/test/definitions/test_helper.rb +++ b/test/definitions/test_helper.rb @@ -209,6 +209,15 @@ def assume_service_missing(name, priority = 30) yield service if block_given? end end + + def mock_satellite_maintain_config + config = { + 'current_sat_version' => '6.16', + 'previous_sat_version' => '6.15', + } + Features::Satellite.any_instance.stubs(:satellite_maintain_config).returns(config) + Features::Capsule.any_instance.stubs(:satellite_maintain_config).returns(config) + end end TEST_DIR = File.dirname(__FILE__)