foreman_maintain 1.3.4 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 467793fe18d5403460cbb877a9b42e8b6c9f82aaf3e876988c444baf0d472e17
-  data.tar.gz: f963b22148f4e08f0daee4a2af1fd479bc655aff1ec6b14c41fe249b51d4e188
+  metadata.gz: a8e76b84acb5103032daf0a4207f4c53a7d425fffe2fbfce49273200e3f5a732
+  data.tar.gz: a91160e10024846b1b931515e55c6461aba0c2c3b5209a966fb9c43685b3eea5
 SHA512:
-  metadata.gz: cfce108a55c8f37f82da2b07081a3362f47267a95926e105c74dfc6602eb48ee424603026c9aec32d26e263a1e84deab68a7008953bcfece418029533d14376c
-  data.tar.gz: 8e8f0b94739d7e03f1ca3e8f197013780c030ab46a9d5c6f81c4ee7d2169d37c5d9a21fdd779544c947abb87b8346f67b2b9de7ebe2707c94b6afc4ec9e7298b
+  metadata.gz: 005d201ea441c1e1ecdd51838f76f9157357a332cb025ba6ea9fe835bff604d601b259ca374d8cf32118ab12203bea2dfc490d959127dee1f92768a684fb0e0f
+  data.tar.gz: f51b31aa841554becdf0e3904c1a9d5259bd0d7691a83240b99f731320335ad20ee5428fc5c02267bf41ec50bd4f0e87bce2e7fcb9cec0f068ea4c03b04e1cac

data/definitions/procedures/backup/offline/candlepin_db.rb

@@ -36,7 +36,8 @@ module Procedures::Backup
             pg_backup_file,
             :listed_incremental => File.join(@backup_dir, '.postgres.snar'),
             :volume_size => @tar_volume_size,
-            :data_dir => pg_data_dir
+            :data_dir => pg_data_dir,
+            :restore_dir => feature(:candlepin_database).data_dir
           )
         end
       end

data/definitions/procedures/backup/offline/foreman_db.rb

@@ -39,11 +39,13 @@ module Procedures::Backup
       end
 
       def do_backup(pg_dir, cmd)
+        restore_dir = el? ? feature(:foreman_database).data_dir : pg_dir
         feature(:foreman_database).backup_local(
           pg_backup_file,
           :listed_incremental => File.join(@backup_dir, '.postgres.snar'),
           :volume_size => @tar_volume_size,
           :data_dir => pg_dir,
+          :restore_dir => restore_dir,
           :command => cmd
         )
       end

data/definitions/procedures/backup/offline/pulpcore_db.rb

@@ -36,7 +36,8 @@ module Procedures::Backup
             pg_backup_file,
             :listed_incremental => File.join(@backup_dir, '.postgres.snar'),
             :volume_size => @tar_volume_size,
-            :data_dir => pg_data_dir
+            :data_dir => pg_data_dir,
+            :restore_dir => feature(:pulpcore_database).data_dir
           )
         end
       end

data/definitions/scenarios/{upgrade_to_capsule_6_14_z.rb → upgrade_to_capsule_6_15.rb}

@@ -1,4 +1,4 @@
-module Scenarios::Capsule_6_14_z
+module Scenarios::Capsule_6_15
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
@@ -6,20 +6,20 @@ module Scenarios::Capsule_6_14_z
         confine do
           feature(:capsule) &&
             (feature(:capsule).current_minor_version == '6.14' || \
-              ForemanMaintain.upgrade_in_progress == '6.14.z')
+            ForemanMaintain.upgrade_in_progress == '6.15')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.14.z'
+      '6.15'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Capsule 6.14.z'
+      description 'Checks before upgrading to Capsule 6.15'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -28,13 +28,13 @@ module Scenarios::Capsule_6_14_z
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
       add_step(Checks::Foreman::CheckpointSegments)
-      add_step(Checks::Repositories::Validate.new(:version => '6.14'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.15'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Capsule 6.14.z'
+      description 'Procedures before migrating to Capsule 6.15'
       tags :pre_migrations
     end
 
@@ -45,7 +45,7 @@ module Scenarios::Capsule_6_14_z
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Capsule 6.14.z'
+      description 'Migration scripts to Capsule 6.15'
       tags :migrations
     end
 
@@ -54,7 +54,7 @@ module Scenarios::Capsule_6_14_z
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.14'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
       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,
@@ -67,7 +67,7 @@ module Scenarios::Capsule_6_14_z
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Capsule 6.14.z'
+      description 'Procedures after migrating to Capsule 6.15'
       tags :post_migrations
     end
 
@@ -80,7 +80,7 @@ module Scenarios::Capsule_6_14_z
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Capsule 6.14.z'
+      description 'Checks after upgrading to Capsule 6.15'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/definitions/scenarios/{upgrade_to_capsule_6_14.rb → upgrade_to_capsule_6_15_z.rb}

@@ -1,25 +1,25 @@
-module Scenarios::Capsule_6_14
+module Scenarios::Capsule_6_15_z
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
         tags :upgrade_scenario
         confine do
           feature(:capsule) &&
-            (feature(:capsule).current_minor_version == '6.13' || \
-            ForemanMaintain.upgrade_in_progress == '6.14')
+            (feature(:capsule).current_minor_version == '6.15' || \
+              ForemanMaintain.upgrade_in_progress == '6.15.z')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.14'
+      '6.15.z'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Capsule 6.14'
+      description 'Checks before upgrading to Capsule 6.15.z'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -28,13 +28,13 @@ module Scenarios::Capsule_6_14
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
       add_step(Checks::Foreman::CheckpointSegments)
-      add_step(Checks::Repositories::Validate.new(:version => '6.14'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.15'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Capsule 6.14'
+      description 'Procedures before migrating to Capsule 6.15.z'
       tags :pre_migrations
     end
 
@@ -45,7 +45,7 @@ module Scenarios::Capsule_6_14
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Capsule 6.14'
+      description 'Migration scripts to Capsule 6.15.z'
       tags :migrations
     end
 
@@ -54,7 +54,7 @@ module Scenarios::Capsule_6_14
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.14'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
       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,
@@ -67,7 +67,7 @@ module Scenarios::Capsule_6_14
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Capsule 6.14'
+      description 'Procedures after migrating to Capsule 6.15.z'
       tags :post_migrations
     end
 
@@ -80,7 +80,7 @@ module Scenarios::Capsule_6_14
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Capsule 6.14'
+      description 'Checks after upgrading to Capsule 6.15.z'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/definitions/scenarios/{upgrade_to_satellite_6_14_z.rb → upgrade_to_satellite_6_15.rb}

@@ -1,4 +1,4 @@
-module Scenarios::Satellite_6_14_z
+module Scenarios::Satellite_6_15
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
@@ -6,20 +6,20 @@ module Scenarios::Satellite_6_14_z
         confine do
           feature(:satellite) &&
             (feature(:satellite).current_minor_version == '6.14' || \
-            ForemanMaintain.upgrade_in_progress == '6.14.z')
+            ForemanMaintain.upgrade_in_progress == '6.15')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.14.z'
+      '6.15'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Satellite 6.14.z'
+      description 'Checks before upgrading to Satellite 6.15'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -28,13 +28,13 @@ module Scenarios::Satellite_6_14_z
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
       add_step(Checks::Foreman::CheckpointSegments)
-      add_step(Checks::Repositories::Validate.new(:version => '6.14'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.15'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Satellite 6.14.z'
+      description 'Procedures before migrating to Satellite 6.15'
       tags :pre_migrations
     end
 
@@ -45,8 +45,9 @@ module Scenarios::Satellite_6_14_z
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Satellite 6.14.z'
+      description 'Migration scripts to Satellite 6.15'
       tags :migrations
+      run_strategy :fail_fast
     end
 
     def set_context_mapping
@@ -54,7 +55,7 @@ module Scenarios::Satellite_6_14_z
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.14'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
       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,
@@ -68,7 +69,7 @@ module Scenarios::Satellite_6_14_z
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Satellite 6.14.z'
+      description 'Procedures after migrating to Satellite 6.15'
       tags :post_migrations
     end
 
@@ -81,7 +82,7 @@ module Scenarios::Satellite_6_14_z
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Satellite 6.14.z'
+      description 'Checks after upgrading to Satellite 6.15'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/definitions/scenarios/{upgrade_to_satellite_6_14.rb → upgrade_to_satellite_6_15_z.rb}

@@ -1,25 +1,25 @@
-module Scenarios::Satellite_6_14
+module Scenarios::Satellite_6_15_z
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
         tags :upgrade_scenario
         confine do
           feature(:satellite) &&
-            (feature(:satellite).current_minor_version == '6.13' || \
-            ForemanMaintain.upgrade_in_progress == '6.14')
+            (feature(:satellite).current_minor_version == '6.15' || \
+            ForemanMaintain.upgrade_in_progress == '6.15.z')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '6.14'
+      '6.15.z'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Satellite 6.14'
+      description 'Checks before upgrading to Satellite 6.15.z'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -28,13 +28,13 @@ module Scenarios::Satellite_6_14
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
       add_step(Checks::Foreman::CheckpointSegments)
-      add_step(Checks::Repositories::Validate.new(:version => '6.14'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.15'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Satellite 6.14'
+      description 'Procedures before migrating to Satellite 6.15.z'
       tags :pre_migrations
     end
 
@@ -45,9 +45,8 @@ module Scenarios::Satellite_6_14
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Satellite 6.14'
+      description 'Migration scripts to Satellite 6.15.z'
       tags :migrations
-      run_strategy :fail_fast
     end
 
     def set_context_mapping
@@ -55,7 +54,7 @@ module Scenarios::Satellite_6_14
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '6.14'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.15'))
       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,
@@ -69,7 +68,7 @@ module Scenarios::Satellite_6_14
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Satellite 6.14'
+      description 'Procedures after migrating to Satellite 6.15.z'
       tags :post_migrations
     end
 
@@ -82,7 +81,7 @@ module Scenarios::Satellite_6_14
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Satellite 6.14'
+      description 'Checks after upgrading to Satellite 6.15.z'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/lib/foreman_maintain/concerns/base_database.rb

@@ -101,13 +101,14 @@ module ForemanMaintain
 
       def backup_local(backup_file, extra_tar_options = {})
         dir = extra_tar_options.fetch(:data_dir, data_dir)
+        restore_dir = extra_tar_options.fetch(:restore_dir, data_dir)
         command = extra_tar_options.fetch(:command, 'create')
 
         FileUtils.cd(dir) do
           tar_options = {
             :archive => backup_file,
             :command => command,
-            :transform => "s,^,#{dir[1..]},S",
+            :transform => "s,^,#{restore_dir[1..]},S",
             :files => '*',
           }.merge(extra_tar_options)
           feature(:tar).run(tar_options)

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.3.4'.freeze
+  VERSION = '1.4.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.3.4
+  version: 1.4.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-11 00:00:00.000000000 Z
+date: 2023-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -332,12 +332,12 @@ files:
 - definitions/scenarios/restore.rb
 - definitions/scenarios/self_upgrade.rb
 - definitions/scenarios/services.rb
-- definitions/scenarios/upgrade_to_capsule_6_14.rb
-- definitions/scenarios/upgrade_to_capsule_6_14_z.rb
+- definitions/scenarios/upgrade_to_capsule_6_15.rb
+- definitions/scenarios/upgrade_to_capsule_6_15_z.rb
 - definitions/scenarios/upgrade_to_foreman_nightly.rb
 - definitions/scenarios/upgrade_to_katello_nightly.rb
-- definitions/scenarios/upgrade_to_satellite_6_14.rb
-- definitions/scenarios/upgrade_to_satellite_6_14_z.rb
+- definitions/scenarios/upgrade_to_satellite_6_15.rb
+- definitions/scenarios/upgrade_to_satellite_6_15_z.rb
 - extras/foreman-maintain.sh
 - extras/foreman_protector/dnf/foreman-protector.py
 - extras/foreman_protector/foreman-protector.conf