QE: Move Salt high state step to correct place

Signed-off-by: Dominik Gedon <dominik.gedon@suse.com>

testsuite/.rubocop_todo.yml

@@ -342,6 +342,7 @@ Style/AndOr:
     - 'features/step_definitions/common_steps.rb'
     - 'features/step_definitions/file_management_steps.rb'
     - 'features/step_definitions/retail_steps.rb'
+    - 'features/step_definitions/salt_steps.rb'
     - 'features/step_definitions/setup_steps.rb'
 
 # Offense count: 1

testsuite/features/step_definitions/command_steps.rb

@@ -237,16 +237,6 @@
   raise 'Vendor change option not found in logs' unless return_code.zero?
 end
 
-When(/^I apply highstate on "([^"]*)"$/) do |host|
-  system_name = get_system_name(host)
-  if host.include? 'ssh_minion'
-    cmd = 'mgr-salt-ssh'
-  elsif host.include? 'minion' or host.include? 'build'
-    cmd = 'salt'
-  end
-  get_target('server').run_until_ok("#{cmd} #{system_name} state.highstate")
-end
-
 When(/^I wait until "([^"]*)" service is active on "([^"]*)"$/) do |service, host|
   node = get_target(host)
   cmd = "systemctl is-active #{service}"

testsuite/features/step_definitions/salt_steps.rb

@@ -578,3 +578,14 @@ def pillar_get(key, minion)
   cleanup = %(salt #{system_name} state.apply util.mgr_switch_to_venv_minion pillar='{"mgr_purge_non_venv_salt_files": True, "mgr_purge_non_venv_salt": True}')
   get_target('server').run(cleanup, check_errors: true, verbose: true)
 end
+
+When(/^I apply highstate on "([^"]*)"$/) do |host|
+  system_name = get_system_name(host)
+  if host.include? 'ssh_minion'
+    cmd = 'mgr-salt-ssh'
+  elsif host.include? 'minion' or host.include? 'build' or host.include? 'proxy'
+    cmd = 'salt'
+  end
+  log "#{cmd} #{system_name} state.highstate"
+  get_target('server').run_until_ok("#{cmd} #{system_name} state.highstate")
+end