unify DB backup steps

theforeman · Jun 26, 2024 · e5476d6 · e5476d6
1 parent e2e9ed0
commit e5476d6
Show file tree

Hide file tree

Showing 8 changed files with 15 additions and 79 deletions.
diff --git a/definitions/procedures/backup/offline/candlepin_db.rb b/definitions/procedures/backup/offline/candlepin_db.rb
diff --git a/definitions/procedures/backup/offline/foreman_db.rb b/definitions/procedures/backup/offline/foreman_db.rb
diff --git a/definitions/procedures/backup/offline/pulpcore_db.rb b/definitions/procedures/backup/offline/pulpcore_db.rb
diff --git a/definitions/procedures/backup/online/candlepin_db.rb b/definitions/procedures/backup/online/candlepin_db.rb
@@ -2,7 +2,7 @@ module Procedures::Backup
   module Online
     class CandlepinDB < ForemanMaintain::Procedure
       metadata do
-        description 'Backup Candlepin database online'
+        description 'Backup Candlepin database'
         tags :backup
         label :backup_online_candlepin_db
         for_feature :candlepin_database

diff --git a/definitions/procedures/backup/online/foreman_db.rb b/definitions/procedures/backup/online/foreman_db.rb
@@ -2,7 +2,7 @@ module Procedures::Backup
   module Online
     class ForemanDB < ForemanMaintain::Procedure
       metadata do
-        description 'Backup Foreman database online'
+        description 'Backup Foreman database'
         tags :backup
         label :backup_online_foreman_db
         for_feature :foreman_database

diff --git a/definitions/procedures/backup/online/pulpcore_db.rb b/definitions/procedures/backup/online/pulpcore_db.rb
@@ -2,7 +2,7 @@ module Procedures::Backup
   module Online
     class PulpcoreDB < ForemanMaintain::Procedure
       metadata do
-        description 'Backup Pulpcore database online'
+        description 'Backup Pulpcore database'
         tags :backup
         label :backup_online_pulpcore_db
         for_feature :pulpcore_database

diff --git a/definitions/scenarios/backup.rb b/definitions/scenarios/backup.rb
@@ -45,10 +45,7 @@ def set_context_mapping
         Procedures::Backup::Pulp => :backup_dir,
         Procedures::Backup::Online::CandlepinDB => :backup_dir,
         Procedures::Backup::Online::ForemanDB => :backup_dir,
-        Procedures::Backup::Online::PulpcoreDB => :backup_dir,
-        Procedures::Backup::Offline::CandlepinDB => :backup_dir,
-        Procedures::Backup::Offline::ForemanDB => :backup_dir,
-        Procedures::Backup::Offline::PulpcoreDB => :backup_dir)
+        Procedures::Backup::Online::PulpcoreDB => :backup_dir)
       context.map(:preserve_dir,
         Procedures::Backup::PrepareDirectory => :preserve_dir)
       context.map(:incremental_dir,
@@ -90,18 +87,19 @@ def add_offline_backup_steps
         add_step(Procedures::Service::Start.new(:only => ['postgresql']))
       end
 
-      add_steps_with_context(
-        Procedures::Backup::Offline::CandlepinDB,
-        Procedures::Backup::Offline::ForemanDB,
-        Procedures::Backup::Offline::PulpcoreDB,
-        Procedures::Service::Start
-      )
+      add_database_backup_steps
+
+      add_steps_with_context(Procedures::Service::Start)
     end
 
     def add_online_backup_steps
       add_step_with_context(Procedures::Backup::ConfigFiles, :ignore_changed_files => true,
         :online_backup => true)
       add_step_with_context(Procedures::Backup::Pulp, :ensure_unchanged => true)
+      add_database_backup_steps
+    end
+
+    def add_database_backup_steps
       add_steps_with_context(
         Procedures::Backup::Online::CandlepinDB,
         Procedures::Backup::Online::ForemanDB,

diff --git a/test/definitions/scenarios/backup_test.rb b/test/definitions/scenarios/backup_test.rb
@@ -27,12 +27,10 @@ module Scenarios
         end
         assert_scenario_has_step(scenario, Procedures::Backup::ConfigFiles)
         assert_scenario_has_step(scenario, Procedures::Backup::Pulp)
-        assert_scenario_has_step(scenario, Procedures::Backup::Offline::CandlepinDB)
-        assert_scenario_has_step(scenario, Procedures::Backup::Offline::ForemanDB)
-        assert_scenario_has_step(scenario, Procedures::Backup::Offline::PulpcoreDB)
-        assert_scenario_has_step(scenario, Procedures::Service::Start) do |step|
-          assert_empty(step.common_options[:only])
-        end
+        assert_scenario_has_step(scenario, Procedures::Backup::Online::CandlepinDB)
+        assert_scenario_has_step(scenario, Procedures::Backup::Online::ForemanDB)
+        assert_scenario_has_step(scenario, Procedures::Backup::Online::PulpcoreDB)
+        assert_scenario_has_step(scenario, Procedures::Service::Start)
         assert_scenario_has_step(scenario, Procedures::Backup::CompressData)
       end
     end