From a0b7a33e175a92c7c0309dd0ebfbd9f8674b350a Mon Sep 17 00:00:00 2001 From: "Eric D. Helms" Date: Fri, 19 Jan 2024 09:53:46 -0500 Subject: [PATCH] Download packages to dnf cache before enabling maintenance mode --- definitions/scenarios/upgrade_to_capsule_6_16.rb | 11 ++++++----- definitions/scenarios/upgrade_to_capsule_6_16_z.rb | 10 +++++----- definitions/scenarios/upgrade_to_satellite_6_16.rb | 10 +++++----- definitions/scenarios/upgrade_to_satellite_6_16_z.rb | 10 +++++----- 4 files changed, 21 insertions(+), 20 deletions(-) diff --git a/definitions/scenarios/upgrade_to_capsule_6_16.rb b/definitions/scenarios/upgrade_to_capsule_6_16.rb index 1aaa13aff..b204f3311 100644 --- a/definitions/scenarios/upgrade_to_capsule_6_16.rb +++ b/definitions/scenarios/upgrade_to_capsule_6_16.rb @@ -38,6 +38,12 @@ class PreMigrations < Abstract end def compose + add_step(Procedures::Repositories::Setup.new(:version => '6.16')) + modules_to_enable = ["satellite-capsule:#{el_short_name}"] + add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable)) + add_step(Procedures::Packages::Update.new(:assumeyes => true, + :dnf_options => ['--downloadonly'])) + add_steps(find_procedures(:pre_migrations)) end end @@ -53,11 +59,6 @@ def set_context_mapping end def compose - add_step(Procedures::Repositories::Setup.new(:version => '6.16')) - modules_to_enable = ["satellite-capsule:#{el_short_name}"] - add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable)) - add_step(Procedures::Packages::Update.new(:assumeyes => true, - :dnf_options => ['--downloadonly'])) add_step(Procedures::Service::Stop.new) add_step(Procedures::Packages::Update.new(:assumeyes => true)) add_step_with_context(Procedures::Installer::Upgrade) diff --git a/definitions/scenarios/upgrade_to_capsule_6_16_z.rb b/definitions/scenarios/upgrade_to_capsule_6_16_z.rb index 292b15bb6..4cc0ec319 100644 --- a/definitions/scenarios/upgrade_to_capsule_6_16_z.rb +++ b/definitions/scenarios/upgrade_to_capsule_6_16_z.rb @@ -38,6 +38,11 @@ class PreMigrations < Abstract end def compose + add_step(Procedures::Repositories::Setup.new(:version => '6.16')) + modules_to_enable = ["satellite-capsule:#{el_short_name}"] + add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable)) + add_step(Procedures::Packages::Update.new(:assumeyes => true, + :dnf_options => ['--downloadonly'])) add_steps(find_procedures(:pre_migrations)) end end @@ -53,11 +58,6 @@ def set_context_mapping end def compose - add_step(Procedures::Repositories::Setup.new(:version => '6.16')) - modules_to_enable = ["satellite-capsule:#{el_short_name}"] - add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable)) - add_step(Procedures::Packages::Update.new(:assumeyes => true, - :dnf_options => ['--downloadonly'])) add_step(Procedures::Service::Stop.new) add_step(Procedures::Packages::Update.new(:assumeyes => true)) add_step_with_context(Procedures::Installer::Upgrade) diff --git a/definitions/scenarios/upgrade_to_satellite_6_16.rb b/definitions/scenarios/upgrade_to_satellite_6_16.rb index f247d9859..e034aa5ba 100644 --- a/definitions/scenarios/upgrade_to_satellite_6_16.rb +++ b/definitions/scenarios/upgrade_to_satellite_6_16.rb @@ -38,6 +38,11 @@ class PreMigrations < Abstract end def compose + add_step(Procedures::Repositories::Setup.new(:version => '6.16')) + modules_to_enable = ["satellite:#{el_short_name}"] + add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable)) + add_step(Procedures::Packages::Update.new(:assumeyes => true, + :dnf_options => ['--downloadonly'])) add_steps(find_procedures(:pre_migrations)) end end @@ -54,11 +59,6 @@ def set_context_mapping end def compose - add_step(Procedures::Repositories::Setup.new(:version => '6.16')) - modules_to_enable = ["satellite:#{el_short_name}"] - add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable)) - add_step(Procedures::Packages::Update.new(:assumeyes => true, - :dnf_options => ['--downloadonly'])) add_step(Procedures::Service::Stop.new) add_step(Procedures::Packages::Update.new(:assumeyes => true)) add_step_with_context(Procedures::Installer::Upgrade) diff --git a/definitions/scenarios/upgrade_to_satellite_6_16_z.rb b/definitions/scenarios/upgrade_to_satellite_6_16_z.rb index a972c1617..c3c033123 100644 --- a/definitions/scenarios/upgrade_to_satellite_6_16_z.rb +++ b/definitions/scenarios/upgrade_to_satellite_6_16_z.rb @@ -38,6 +38,11 @@ class PreMigrations < Abstract end def compose + add_step(Procedures::Repositories::Setup.new(:version => '6.16')) + modules_to_enable = ["satellite:#{el_short_name}"] + add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable)) + add_step(Procedures::Packages::Update.new(:assumeyes => true, + :dnf_options => ['--downloadonly'])) add_steps(find_procedures(:pre_migrations)) end end @@ -53,11 +58,6 @@ def set_context_mapping end def compose - add_step(Procedures::Repositories::Setup.new(:version => '6.16')) - modules_to_enable = ["satellite:#{el_short_name}"] - add_step(Procedures::Packages::EnableModules.new(:module_names => modules_to_enable)) - add_step(Procedures::Packages::Update.new(:assumeyes => true, - :dnf_options => ['--downloadonly'])) add_step(Procedures::Service::Stop.new) add_step(Procedures::Packages::Update.new(:assumeyes => true)) add_step_with_context(Procedures::Installer::Upgrade)