Drop all min_version checks

theforeman · Feb 16, 2024 · 2e65e54 · 2e65e54
1 parent a58650e
commit 2e65e54
Show file tree

Hide file tree

Showing 8 changed files with 11 additions and 23 deletions.
diff --git a/definitions/checks/disk/available_space_candlepin.rb b/definitions/checks/disk/available_space_candlepin.rb
@@ -6,7 +6,7 @@ class AvailableSpaceCandlepin < ForemanMaintain::Check
         description 'Check to make sure /var/lib/candlepin has enough space'
         tags :pre_upgrade
         confine do
-          feature(:candlepin) && check_min_version('candlepin', '3.1')
+          feature(:candlepin)
         end
       end
 

diff --git a/definitions/checks/foreman/check_corrupted_roles.rb b/definitions/checks/foreman/check_corrupted_roles.rb
@@ -6,9 +6,6 @@ class CheckCorruptedRoles < ForemanMaintain::Check
         for_feature :foreman_database
         description 'Check for roles that have filters with multiple resources attached'
         tags :pre_upgrade
-        confine do
-          check_min_version('foreman', '1.15')
-        end
       end
 
       def run

diff --git a/definitions/checks/foreman/validate_external_db_version.rb b/definitions/checks/foreman/validate_external_db_version.rb
@@ -6,8 +6,7 @@ class ValidateExternalDbVersion < ForemanMaintain::Check
         tags :pre_upgrade
         label :validate_external_db_version
         confine do
-          feature(:foreman_database) && !feature(:foreman_database).local? &&
-            !check_min_version('foreman', '2.0')
+          feature(:foreman_database) && !feature(:foreman_database).local?
         end
       end
 

diff --git a/definitions/features/foreman_tasks.rb b/definitions/features/foreman_tasks.rb
@@ -93,10 +93,8 @@ def delete(state)
       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
+    sql += 'DELETE FROM foreman_tasks_links as ftl ' \
+           'where ftl.task_id NOT IN (SELECT id FROM foreman_tasks_tasks);'
 
     feature(:foreman_database).psql("BEGIN; #{sql}; COMMIT;")
 
@@ -134,7 +132,7 @@ def services
   end
 
   def service_name
-    check_min_version('foreman', '1.17') ? 'dynflowd' : 'foreman-tasks'
+    'dynflowd'
   end
 
   private

diff --git a/definitions/features/pulpcore_database.rb b/definitions/features/pulpcore_database.rb
@@ -9,7 +9,7 @@ class Features::PulpcoreDatabase < ForemanMaintain::Feature
     label :pulpcore_database
 
     confine do
-      file_nonzero?(PULPCORE_DB_CONFIG) && check_min_version('katello-common', '3.18')
+      file_nonzero?(PULPCORE_DB_CONFIG)
     end
   end
 

diff --git a/definitions/procedures/foreman/fix_corrupted_roles.rb b/definitions/procedures/foreman/fix_corrupted_roles.rb
@@ -4,9 +4,6 @@ class FixCorruptedRoles < ForemanMaintain::Procedure
       for_feature :foreman_database
       desc = 'Create additional filters so that each filter has only permissions of one resource'
       description desc
-      confine do
-        check_min_version('foreman', '1.15')
-      end
     end
 
     def run

diff --git a/definitions/procedures/puppet/remove_puppet.rb b/definitions/procedures/puppet/remove_puppet.rb
@@ -3,8 +3,7 @@ class RemovePuppet < ForemanMaintain::Procedure
     metadata do
       description 'Remove Puppet feature'
       confine do
-        feature(:puppet_server) &&
-          (check_min_version('foreman', '3.6') || check_min_version('foreman-proxy', '3.6'))
+        feature(:puppet_server)
       end
       advanced_run false
     end

diff --git a/definitions/scenarios/puppet.rb b/definitions/scenarios/puppet.rb
@@ -10,12 +10,10 @@ class RemovePuppet < ForemanMaintain::Scenario
       end
 
       def compose
-        if check_min_version('foreman', '3.0') || check_min_version('foreman-proxy', '3.0')
-          add_step(Checks::CheckPuppetCapsules) if server?
-          add_step(Procedures::Puppet::RemovePuppet)
-          add_step(Procedures::Puppet::RemovePuppetData) if context.get(:remove_data)
-          add_step(Procedures::Service::Restart)
-        end
+        add_step(Checks::CheckPuppetCapsules) if server?
+        add_step(Procedures::Puppet::RemovePuppet)
+        add_step(Procedures::Puppet::RemovePuppetData) if context.get(:remove_data)
+        add_step(Procedures::Service::Restart)
       end
     end
   end