QE: Resolving problems found during PR

uyuni-project · Feb 21, 2025 · 412b8b9 · 412b8b9
1 parent c49467d
commit 412b8b9
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 18 deletions.
diff --git a/testsuite/features/secondary/allcli_system_group.feature b/testsuite/features/secondary/allcli_system_group.feature
@@ -6,7 +6,6 @@ Feature: Manage a group of systems
 
   Scenario: Log in as org admin user
     Given I am authorized for the "Admin" section
-    When I install the GPG key of the test packages repository on:"sle_minion" minion
 
   Scenario: Pre-requisite: enable dummy packages to fake an installation
     When I enable repository "test_repo_rpm_pool" on this "sle_minion"
@@ -142,8 +141,8 @@ Feature: Manage a group of systems
     And I should see "rhlike_minion" as link
     And I should see "sle_minion" as link
 
+# container already has locale formula installed
 @skip_if_containerized_server
-  # container already has locale formula installed
   Scenario: Install the locale formula package on the server
     When I manually install the "locale" formula on the server
 

diff --git a/testsuite/features/step_definitions/command_steps.rb b/testsuite/features/step_definitions/command_steps.rb
@@ -156,10 +156,6 @@
   get_target('server').run("echo -e \"admin\nadmin\n\" | mgr-sync add channel #{channel}", buffer_size: 1_000_000)
 end
 
-When(/^I sync "([^"]*)" channel$/) do |channel|
-  get_target('server').run("echo -e \"admin\nadmin\n\" | mgr-sync sync --with-children #{channel}", buffer_size: 1_000_000)
-end
-
 When(/^I use spacewalk-common-channel to add channel "([^"]*)" with arch "([^"]*)"$/) do |child_channel, arch|
   command = "spacewalk-common-channels -u admin -p admin -a #{arch} #{child_channel}"
   $command_output, _code = get_target('server').run(command)

diff --git a/testsuite/features/step_definitions/retail_steps.rb b/testsuite/features/step_definitions/retail_steps.rb
@@ -244,18 +244,6 @@
   get_target('server').run("salt #{system_name} cmd.run 'rpmkeys --import #{dest}'")
 end
 
-When(/^I install the GPG key of the test packages repository on:"([^"]*)" minion$/) do |minion|
-  file = 'uyuni.key'
-  source = "#{File.dirname(__FILE__)}/../upload_files/#{file}"
-  dest = "/tmp/#{file}"
-  success = file_inject(get_target('server'), source, dest)
-  raise ScriptError, 'File injection failed' unless success
-
-  system_name = get_system_name(minion)
-  get_target('server').run("salt-cp #{system_name} #{dest} #{dest}")
-  get_target('server').run("salt #{system_name} cmd.run 'rpmkeys --import #{dest}'")
-end
-
 When(/^I wait until Salt client is inactive on the PXE boot minion$/) do
   file = 'wait-end-of-cleanup-pxeboot.exp'
   source = "#{File.dirname(__FILE__)}/../upload_files/#{file}"