foreman_maintain 1.0.5 → 1.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bda89886170f69276ffe2a0fcca046581c62096011e59251f199d451a6e49ddb
-  data.tar.gz: 5f63a1d69ab49281d15e1d4004f1726d9c7b45eccbeeaa0015615176c7973e01
+  metadata.gz: 41c40d80a596e78552a9e066e6d769db4fe57cd9e7c7368a7d64cf21f68edefa
+  data.tar.gz: 4908652d3cc57dde9b08081b0d5fa20fac5cc9f8ab41f19778243a29b0963002
 SHA512:
-  metadata.gz: a2e1859b3479357698652f5b448e97e9ebe4977b6f71a851efc7498ae8f9e622d4a0a69a6589a8206d00071129345bceacececf04133fb958f85924c9c5ba79b
-  data.tar.gz: 4db6f08840e3767357d0d57a9b32ff61779627e03118396ca41c99f2ea3f7ea355596e7d353dc1352b56290b7c4fc6b81a17bf74dad09cadf76b52af660cfc32
+  metadata.gz: aa7003129978adaa2e1798c3fa191a5be628403b1d86df618bd92110829de5b8f0cd81a2f6c97b1df2befeeda693ba950acdf985c843482d2d027d333e771957
+  data.tar.gz: 1c16a69c401058063919df5c8b8a595a4b04d17c5662f93e12b9999bfa5e566f6276b1b4a1998ffb5a3d3f964af76a8275eae68554826a22b4aef8f3ca7b81fb

data/definitions/features/foreman_tasks.rb

@@ -82,15 +82,22 @@ class Features::ForemanTasks < ForemanMaintain::Feature
   def delete(state)
     tasks_condition = condition(state)
 
-    feature(:foreman_database).psql(<<-SQL)
-     BEGIN;
-       DELETE FROM dynflow_steps USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_steps.execution_plan_uuid::varchar) AND #{tasks_condition};
-       DELETE FROM dynflow_actions USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_actions.execution_plan_uuid::varchar) AND #{tasks_condition};
-       DELETE FROM dynflow_execution_plans USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_execution_plans.uuid::varchar) AND #{tasks_condition};
-       DELETE FROM foreman_tasks_tasks WHERE #{tasks_condition};
-     COMMIT;
+    sql = <<-SQL
+      DELETE FROM dynflow_steps USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_steps.execution_plan_uuid::varchar) AND #{tasks_condition};
+      DELETE FROM dynflow_actions USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_actions.execution_plan_uuid::varchar) AND #{tasks_condition};
+      DELETE FROM dynflow_execution_plans USING foreman_tasks_tasks WHERE (foreman_tasks_tasks.external_id = dynflow_execution_plans.uuid::varchar) AND #{tasks_condition};
+      DELETE FROM foreman_tasks_tasks WHERE #{tasks_condition};
+      -- Delete locks and links which may now be orphaned
+      DELETE FROM foreman_tasks_locks as ftl where ftl.task_id NOT IN (SELECT id FROM foreman_tasks_tasks);
     SQL
 
+    if check_min_version(foreman_plugin_name('foreman-tasks'), '4.0.0')
+      sql += 'DELETE FROM foreman_tasks_links as ftl ' \
+             'where ftl.task_id NOT IN (SELECT id FROM foreman_tasks_tasks);'
+    end
+
+    feature(:foreman_database).psql("BEGIN; #{sql}; COMMIT;")
+
     count(state)
   end
 

data/definitions/scenarios/{upgrade_to_capsule_7_0.rb → upgrade_to_capsule_6_11.rb}

@@ -1,4 +1,4 @@
-module Scenarios::Capsule_7_0
+module Scenarios::Capsule_6_11
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
@@ -6,20 +6,20 @@ module Scenarios::Capsule_7_0
         confine do
           feature(:capsule) &&
             (feature(:capsule).current_minor_version == '6.10' || \
-            ForemanMaintain.upgrade_in_progress == '7.0')
+            ForemanMaintain.upgrade_in_progress == '6.11')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '7.0'
+      '6.11'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Capsule 7.0'
+      description 'Checks before upgrading to Capsule 6.11'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -27,13 +27,13 @@ module Scenarios::Capsule_7_0
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Repositories::Validate.new(:version => '7.0'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.11'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Capsule 7.0'
+      description 'Procedures before migrating to Capsule 6.11'
       tags :pre_migrations
     end
 
@@ -46,7 +46,7 @@ module Scenarios::Capsule_7_0
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Capsule 7.0'
+      description 'Migration scripts to Capsule 6.11'
       tags :migrations
     end
 
@@ -55,7 +55,7 @@ module Scenarios::Capsule_7_0
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '7.0'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.11'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)
@@ -64,7 +64,7 @@ module Scenarios::Capsule_7_0
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Capsule 7.0'
+      description 'Procedures after migrating to Capsule 6.11'
       tags :post_migrations
     end
 
@@ -77,7 +77,7 @@ module Scenarios::Capsule_7_0
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Capsule 7.0'
+      description 'Checks after upgrading to Capsule 6.11'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/definitions/scenarios/{upgrade_to_capsule_7_0_z.rb → upgrade_to_capsule_6_11_z.rb}

@@ -1,25 +1,25 @@
-module Scenarios::Capsule_7_0_z
+module Scenarios::Capsule_6_11_z
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
         tags :upgrade_scenario
         confine do
           feature(:capsule) &&
-            (feature(:capsule).current_minor_version == '7.0' || \
-              ForemanMaintain.upgrade_in_progress == '7.0.z')
+            (feature(:capsule).current_minor_version == '6.11' || \
+              ForemanMaintain.upgrade_in_progress == '6.11.z')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '7.0.z'
+      '6.11.z'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Capsule 7.0.z'
+      description 'Checks before upgrading to Capsule 6.11.z'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -27,13 +27,13 @@ module Scenarios::Capsule_7_0_z
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Repositories::Validate.new(:version => '7.0'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.11'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Capsule 7.0.z'
+      description 'Procedures before migrating to Capsule 6.11.z'
       tags :pre_migrations
     end
 
@@ -45,7 +45,7 @@ module Scenarios::Capsule_7_0_z
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Capsule 7.0.z'
+      description 'Migration scripts to Capsule 6.11.z'
       tags :migrations
     end
 
@@ -54,7 +54,7 @@ module Scenarios::Capsule_7_0_z
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '7.0'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.11'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)
@@ -63,7 +63,7 @@ module Scenarios::Capsule_7_0_z
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Capsule 7.0.z'
+      description 'Procedures after migrating to Capsule 6.11.z'
       tags :post_migrations
     end
 
@@ -76,7 +76,7 @@ module Scenarios::Capsule_7_0_z
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Capsule 7.0.z'
+      description 'Checks after upgrading to Capsule 6.11.z'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/definitions/scenarios/{upgrade_to_satellite_7_0.rb → upgrade_to_satellite_6_11.rb}

@@ -1,4 +1,4 @@
-module Scenarios::Satellite_7_0
+module Scenarios::Satellite_6_11
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
@@ -6,20 +6,20 @@ module Scenarios::Satellite_7_0
         confine do
           feature(:satellite) &&
             (feature(:satellite).current_minor_version == '6.10' || \
-            ForemanMaintain.upgrade_in_progress == '7.0')
+            ForemanMaintain.upgrade_in_progress == '6.11')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '7.0'
+      '6.11'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Satellite 7.0'
+      description 'Checks before upgrading to Satellite 6.11'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -29,13 +29,13 @@ module Scenarios::Satellite_7_0
       add_steps(find_checks(:pre_upgrade))
 
       add_step(Checks::Foreman::CheckpointSegments)
-      add_step(Checks::Repositories::Validate.new(:version => '7.0'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.11'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Satellite 7.0'
+      description 'Procedures before migrating to Satellite 6.11'
       tags :pre_migrations
     end
 
@@ -48,7 +48,7 @@ module Scenarios::Satellite_7_0
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Satellite 7.0'
+      description 'Migration scripts to Satellite 6.11'
       tags :migrations
       run_strategy :fail_fast
     end
@@ -58,7 +58,7 @@ module Scenarios::Satellite_7_0
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '7.0'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.11'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)
@@ -68,7 +68,7 @@ module Scenarios::Satellite_7_0
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Satellite 7.0'
+      description 'Procedures after migrating to Satellite 6.11'
       tags :post_migrations
     end
 
@@ -81,7 +81,7 @@ module Scenarios::Satellite_7_0
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Satellite 7.0'
+      description 'Checks after upgrading to Satellite 6.11'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/definitions/scenarios/{upgrade_to_satellite_7_0_z.rb → upgrade_to_satellite_6_11_z.rb}

@@ -1,25 +1,25 @@
-module Scenarios::Satellite_7_0_z
+module Scenarios::Satellite_6_11_z
   class Abstract < ForemanMaintain::Scenario
     def self.upgrade_metadata(&block)
       metadata do
         tags :upgrade_scenario
         confine do
           feature(:satellite) &&
-            (feature(:satellite).current_minor_version == '7.0' || \
-            ForemanMaintain.upgrade_in_progress == '7.0.z')
+            (feature(:satellite).current_minor_version == '6.11' || \
+            ForemanMaintain.upgrade_in_progress == '6.11.z')
         end
         instance_eval(&block)
       end
     end
 
     def target_version
-      '7.0.z'
+      '6.11.z'
     end
   end
 
   class PreUpgradeCheck < Abstract
     upgrade_metadata do
-      description 'Checks before upgrading to Satellite 7.0.z'
+      description 'Checks before upgrading to Satellite 6.11.z'
       tags :pre_upgrade_checks
       run_strategy :fail_slow
     end
@@ -27,13 +27,13 @@ module Scenarios::Satellite_7_0_z
     def compose
       add_steps(find_checks(:default))
       add_steps(find_checks(:pre_upgrade))
-      add_step(Checks::Repositories::Validate.new(:version => '7.0'))
+      add_step(Checks::Repositories::Validate.new(:version => '6.11'))
     end
   end
 
   class PreMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures before migrating to Satellite 7.0.z'
+      description 'Procedures before migrating to Satellite 6.11.z'
       tags :pre_migrations
     end
 
@@ -45,7 +45,7 @@ module Scenarios::Satellite_7_0_z
 
   class Migrations < Abstract
     upgrade_metadata do
-      description 'Migration scripts to Satellite 7.0.z'
+      description 'Migration scripts to Satellite 6.11.z'
       tags :migrations
     end
 
@@ -54,7 +54,7 @@ module Scenarios::Satellite_7_0_z
     end
 
     def compose
-      add_step(Procedures::Repositories::Setup.new(:version => '7.0'))
+      add_step(Procedures::Repositories::Setup.new(:version => '6.11'))
       add_step(Procedures::Packages::UnlockVersions.new)
       add_step(Procedures::Packages::Update.new(:assumeyes => true))
       add_step_with_context(Procedures::Installer::Upgrade)
@@ -64,7 +64,7 @@ module Scenarios::Satellite_7_0_z
 
   class PostMigrations < Abstract
     upgrade_metadata do
-      description 'Procedures after migrating to Satellite 7.0.z'
+      description 'Procedures after migrating to Satellite 6.11.z'
       tags :post_migrations
     end
 
@@ -77,7 +77,7 @@ module Scenarios::Satellite_7_0_z
 
   class PostUpgradeChecks < Abstract
     upgrade_metadata do
-      description 'Checks after upgrading to Satellite 7.0.z'
+      description 'Checks after upgrading to Satellite 6.11.z'
       tags :post_upgrade_checks
       run_strategy :fail_slow
     end

data/lib/foreman_maintain/cli/self_upgrade_command.rb

@@ -3,7 +3,7 @@ module ForemanMaintain
     class SelfUpgradeCommand < Base
       option ['--target-version'], 'TARGET_VERSION',\
              'Major version of the Satellite or Capsule'\
-           	', e.g 7.0', :required => true
+             ', e.g 6.11', :required => true
       def execute
         allow_major_version_upgrade_only
         run_scenario(upgrade_scenario, upgrade_rescue_scenario)

data/lib/foreman_maintain/concerns/downstream.rb

@@ -116,7 +116,7 @@ module ForemanMaintain
       end
 
       def common_repos(full_version)
-        sat_maint_version = if version(full_version) >= version('7.0') && !use_beta_repos?
+        sat_maint_version = if version(full_version) >= version('6.11') && !use_beta_repos?
                               full_version
                             else
                               full_version[0]

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '1.0.5'.freeze
+  VERSION = '1.0.6'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors:
 - Ivan Nečas
@@ -334,14 +334,16 @@ files:
 - definitions/scenarios/services.rb
 - definitions/scenarios/upgrade_to_capsule_6_10.rb
 - definitions/scenarios/upgrade_to_capsule_6_10_z.rb
+- definitions/scenarios/upgrade_to_capsule_6_11.rb
+- definitions/scenarios/upgrade_to_capsule_6_11_z.rb
 - definitions/scenarios/upgrade_to_capsule_6_8.rb
 - definitions/scenarios/upgrade_to_capsule_6_8_z.rb
 - definitions/scenarios/upgrade_to_capsule_6_9.rb
 - definitions/scenarios/upgrade_to_capsule_6_9_z.rb
-- definitions/scenarios/upgrade_to_capsule_7_0.rb
-- definitions/scenarios/upgrade_to_capsule_7_0_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_10.rb
 - definitions/scenarios/upgrade_to_satellite_6_10_z.rb
+- definitions/scenarios/upgrade_to_satellite_6_11.rb
+- definitions/scenarios/upgrade_to_satellite_6_11_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_2.rb
 - definitions/scenarios/upgrade_to_satellite_6_2_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_3.rb
@@ -358,8 +360,6 @@ files:
 - definitions/scenarios/upgrade_to_satellite_6_8_z.rb
 - definitions/scenarios/upgrade_to_satellite_6_9.rb
 - definitions/scenarios/upgrade_to_satellite_6_9_z.rb
-- definitions/scenarios/upgrade_to_satellite_7_0.rb
-- definitions/scenarios/upgrade_to_satellite_7_0_z.rb
 - extras/foreman-maintain.sh
 - extras/foreman_protector/foreman-protector.conf
 - extras/foreman_protector/foreman-protector.py