From 78e8788e4fcfe6715f0cf63a281c8c0ac9f11f0c Mon Sep 17 00:00:00 2001 From: Eric Bischoff Date: Mon, 26 Aug 2024 19:28:26 +0200 Subject: [PATCH 1/3] Cosmetical changes --- .../secondary/min_bootstrap_script.feature | 26 +++++++++---------- .../secondary/minssh_bootstrap_api.feature | 4 +-- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/testsuite/features/secondary/min_bootstrap_script.feature b/testsuite/features/secondary/min_bootstrap_script.feature index cdb857a6ea29..ef7de078f2b1 100644 --- a/testsuite/features/secondary/min_bootstrap_script.feature +++ b/testsuite/features/secondary/min_bootstrap_script.feature @@ -78,17 +78,17 @@ Feature: Register a Salt minion with a bootstrap script And I wait until event "Subscribe channels scheduled by admin" is completed Scenario: Install a package to the script-bootstrapped SLES minion - Given I am on the Systems overview page of this "sle_minion" - When I follow "Software" in the content area - And I follow "Install" - And I enter "orion-dummy" as the filtered package name - And I click on the filter button - And I check row with "orion-dummy" and arch of "sle_minion" - And I click on "Install Selected Packages" - And I click on "Confirm" - Then I should see a "1 package install has been scheduled for" text - When I wait until event "Package Install/Upgrade scheduled by admin" is completed - Then "orion-dummy-1.1-1.1" should be installed on "sle_minion" + Given I am on the Systems overview page of this "sle_minion" + When I follow "Software" in the content area + And I follow "Install" + And I enter "orion-dummy" as the filtered package name + And I click on the filter button + And I check row with "orion-dummy" and arch of "sle_minion" + And I click on "Install Selected Packages" + And I click on "Confirm" + Then I should see a "1 package install has been scheduled for" text + When I wait until event "Package Install/Upgrade scheduled by admin" is completed + Then "orion-dummy-1.1-1.1" should be installed on "sle_minion" Scenario: Run a remote command on normal SLES minion When I follow the left menu "Salt > Remote Commands" @@ -107,5 +107,5 @@ Feature: Register a Salt minion with a bootstrap script Then I run spacecmd listeventhistory for "sle_minion" Scenario: Cleanup: remove package from script-bootstrapped SLES minion - When I remove package "orion-dummy-1.1-1.1" from this "sle_minion" - Then "orion-dummy-1.1-1.1" should not be installed on "sle_minion" + When I remove package "orion-dummy-1.1-1.1" from this "sle_minion" + Then "orion-dummy-1.1-1.1" should not be installed on "sle_minion" diff --git a/testsuite/features/secondary/minssh_bootstrap_api.feature b/testsuite/features/secondary/minssh_bootstrap_api.feature index a28b0fbf3631..06097288a7fd 100644 --- a/testsuite/features/secondary/minssh_bootstrap_api.feature +++ b/testsuite/features/secondary/minssh_bootstrap_api.feature @@ -27,7 +27,7 @@ Feature: Register a salt-ssh system via API Then "ssh_minion" should not be registered @proxy - Scenario: block direct access from server to sshminion to test proxy as jumphost + Scenario: Block direct access from server to sshminion to test proxy as jumphost Given I block connections from "server" on "ssh_minion" Scenario: Bootstrap a SLES SSH minion via API @@ -91,5 +91,5 @@ Feature: Register a salt-ssh system via API And I wait until event "Subscribe channels scheduled by admin" is completed @proxy - Scenario: cleanup and flush the firewall rules + Scenario: Cleanup and flush the firewall rules When I flush firewall on "ssh_minion" From 30b86dd795eba53c6bc545be9a2eb7cd20cd9761 Mon Sep 17 00:00:00 2001 From: Eric Bischoff Date: Mon, 26 Aug 2024 19:34:07 +0200 Subject: [PATCH 2/3] Fix idempotency --- testsuite/features/secondary/min_ssh_tunnel.feature | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/testsuite/features/secondary/min_ssh_tunnel.feature b/testsuite/features/secondary/min_ssh_tunnel.feature index 50253182759d..12f8ae655814 100644 --- a/testsuite/features/secondary/min_ssh_tunnel.feature +++ b/testsuite/features/secondary/min_ssh_tunnel.feature @@ -89,9 +89,8 @@ Feature: Register a Salt system to be managed via SSH tunnel And I wait until I see "has been deleted" text Then "ssh_minion" should not be registered - Scenario: Cleanup: register a Salt minion after SSH tunnel tests - When I bootstrap "ssh_minion" using bootstrap script with activation key "1-SUSE-SSH-KEY-x86_64" from the server - And I wait at most 10 seconds until Salt master sees "ssh_minion" as "unaccepted" - And I accept "ssh_minion" key in the Salt master - Then I should see "ssh_minion" via spacecmd + Scenario: Cleanup: register a SSH minion after SSH tunnel tests + When I call system.bootstrap() on host "ssh_minion" and salt-ssh "enabled" + And I follow the left menu "Systems > Overview" + And I wait until I see the name of "ssh_minion", refreshing the page And I wait until onboarding is completed for "ssh_minion" From f47be1b0788a891c35f434fe78048cafac871df8 Mon Sep 17 00:00:00 2001 From: Eric Bischoff Date: Mon, 26 Aug 2024 19:38:12 +0200 Subject: [PATCH 3/3] Follow features naming conventions --- testsuite/features/reposync/srv_create_activationkey.feature | 2 +- testsuite/features/secondary/min_bootstrap_script.feature | 2 +- .../secondary/{min_ssh_tunnel.feature => minssh_tunnel.feature} | 0 testsuite/run_sets/secondary.yml | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) rename testsuite/features/secondary/{min_ssh_tunnel.feature => minssh_tunnel.feature} (100%) diff --git a/testsuite/features/reposync/srv_create_activationkey.feature b/testsuite/features/reposync/srv_create_activationkey.feature index d03a4b5bb2e2..efb248bdc599 100644 --- a/testsuite/features/reposync/srv_create_activationkey.feature +++ b/testsuite/features/reposync/srv_create_activationkey.feature @@ -24,7 +24,7 @@ # If the DEBLIKE-KEY fails to be created: # - features/secondary/min_debike_salt.feature # If the SUSE-SSH-KEY-x86_64 fails to be created: -# - features/secondary/min_ssh_tunnel.feature +# - features/secondary/minssh_tunnel.feature # - features/secondary/minssh_move_from_and_to_proxy.feature diff --git a/testsuite/features/secondary/min_bootstrap_script.feature b/testsuite/features/secondary/min_bootstrap_script.feature index ef7de078f2b1..838588f4bfd7 100644 --- a/testsuite/features/secondary/min_bootstrap_script.feature +++ b/testsuite/features/secondary/min_bootstrap_script.feature @@ -2,7 +2,7 @@ # Licensed under the terms of the MIT license. # # This feature can cause failures in the following features: -# - features/secondary/min_ssh_tunnel.feature +# - features/secondary/minssh_tunnel.feature # If the minion fails to bootstrap # TODO: This feature is not working within a proxy containerized environment diff --git a/testsuite/features/secondary/min_ssh_tunnel.feature b/testsuite/features/secondary/minssh_tunnel.feature similarity index 100% rename from testsuite/features/secondary/min_ssh_tunnel.feature rename to testsuite/features/secondary/minssh_tunnel.feature diff --git a/testsuite/run_sets/secondary.yml b/testsuite/run_sets/secondary.yml index d0fd70113c29..ab6aded49c91 100644 --- a/testsuite/run_sets/secondary.yml +++ b/testsuite/run_sets/secondary.yml @@ -32,7 +32,7 @@ - features/secondary/minssh_bootstrap_api.feature - features/secondary/min_bootstrap_ssh_key.feature - features/secondary/min_bootstrap_script.feature -- features/secondary/min_ssh_tunnel.feature +- features/secondary/minssh_tunnel.feature - features/secondary/min_activationkey.feature - features/secondary/min_salt_minions_page.feature - features/secondary/min_salt_mgrcompat_state.feature