Fixes #33346 - limit switchover run below Katello 4.0 version

theforeman · Aug 25, 2021 · e6a25d1 · e6a25d1
1 parent ab0e226
commit e6a25d1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/definitions/procedures/content/switchover.rb b/definitions/procedures/content/switchover.rb
@@ -5,8 +5,7 @@ class Switchover < ForemanMaintain::Procedure
       for_feature :pulpcore
 
       confine do
-        # FIXME: remove this condition for the 6.10 upgrade scenario
-        !feature(:instance).downstream
+        !check_min_version(foreman_plugin_name('katello'), '4.0')
       end
 
       param :skip_deb, 'Do not run debian options in installer.'

diff --git a/definitions/scenarios/content.rb b/definitions/scenarios/content.rb
@@ -43,11 +43,8 @@ class Switchover < ContentBase
       end
 
       def compose
-        # FIXME: remove this condition for the 6.10 upgrade scenario
-        if Procedures::Content::Switchover.present?
-          add_step(Procedures::Content::Switchover)
-          add_step(Procedures::Foreman::ApipieCache)
-        end
+        add_step_with_context(Procedures::Content::Switchover)
+        add_step(Procedures::Foreman::ApipieCache)
       end
     end