Merge pull request #8579 from nodeg/50bv-proxy

QE: BV fixes for SLE Micro and containerized proxy

testsuite/features/build_validation/init_clients/proxy_container.feature

@@ -15,10 +15,14 @@ Feature: Setup containerized proxy
   As the system administrator
   I want to register the containerized proxy on the server
 
+  Scenario: Clean up sumaform leftovers on the containerized proxy
+    When I perform a full salt minion cleanup on "proxy"
+    And I reboot the "proxy" host through SSH, waiting until it comes back
+
   Scenario: Log in as admin user
     Given I am authorized for the "Admin" section
 
-# TODO: Enable the following scenarios once the team fixes the SLE Micro bootstrapping issues
+# TODO: Remove this tag, once bsc#1222628 is fixed
 @skip
   Scenario: Bootstrap the proxy host as a salt minion
     When I follow the left menu "Systems > Bootstrapping"
@@ -31,13 +35,12 @@ Feature: Setup containerized proxy
     And I click on "Bootstrap"
     And I wait until I see "Bootstrap process initiated." text
 
-# workaround for bsc#1218146
-# Once we start using Leap Micro #23811 in Uyuni Proxy, we need to remove this Cucumber tag
+# TODO: Remove this tag, once bsc#1222628 is fixed
 @skip
-@susemanager
   Scenario: Reboot the proxy host
     When I reboot the "proxy" host through SSH, waiting until it comes back
 
+# TODO: Remove this tag, once bsc#1222628 is fixed
 @skip
   Scenario: Wait until the proxy host appears
     When I wait until onboarding is completed for "proxy"

testsuite/features/build_validation/init_clients/slemicro51_minion.feature

@@ -9,6 +9,7 @@ Feature: Bootstrap a SLE Micro 5.1 Salt minion
 
   Scenario: Clean up sumaform leftovers on a SLE Micro 5.1 minion
     When I perform a full salt minion cleanup on "slemicro51_minion"
+    And I reboot the "slemicro51_minion" host through SSH, waiting until it comes back
 
   Scenario: Log in as admin user
     Given I am authorized for the "Admin" section

testsuite/features/build_validation/init_clients/slemicro51_ssh_minion.feature

@@ -9,6 +9,7 @@ Feature: Bootstrap a SLE Micro 5.1 Salt SSH minion
 
   Scenario: Clean up sumaform leftovers on a SLE Micro SSH 5.1 minion
     When I perform a full salt minion cleanup on "slemicro51_ssh_minion"
+    And I reboot the "slemicro51_ssh_minion" host through SSH, waiting until it comes back
 
   Scenario: Log in as admin user
     Given I am authorized for the "Admin" section

testsuite/features/build_validation/init_clients/slemicro52_minion.feature

@@ -9,6 +9,7 @@ Feature: Bootstrap a SLE Micro 5.2 Salt minion
 
   Scenario: Clean up sumaform leftovers on a SLE Micro 5.2 minion
     When I perform a full salt minion cleanup on "slemicro52_minion"
+    And I reboot the "slemicro52_minion" host through SSH, waiting until it comes back
 
   Scenario: Log in as admin user
     Given I am authorized for the "Admin" section

testsuite/features/build_validation/init_clients/slemicro52_ssh_minion.feature

@@ -9,6 +9,7 @@ Feature: Bootstrap a SLE Micro 5.2 Salt SSH minion
 
   Scenario: Clean up sumaform leftovers on a SLE Micro SSH 5.2 SSH minion
     When I perform a full salt minion cleanup on "slemicro52_ssh_minion"
+    And I reboot the "slemicro52_ssh_minion" host through SSH, waiting until it comes back
 
   Scenario: Log in as admin user
     Given I am authorized for the "Admin" section

testsuite/features/build_validation/init_clients/slemicro53_minion.feature

@@ -9,6 +9,7 @@ Feature: Bootstrap a SLE Micro 5.3 Salt minion
 
   Scenario: Clean up sumaform leftovers on a SLE Micro 5.3 minion
     When I perform a full salt minion cleanup on "slemicro53_minion"
+    And I reboot the "slemicro53_minion" host through SSH, waiting until it comes back
 
   Scenario: Log in as admin user
     Given I am authorized for the "Admin" section

testsuite/features/build_validation/init_clients/slemicro53_ssh_minion.feature

@@ -9,6 +9,7 @@ Feature: Bootstrap a SLE Micro 5.3 Salt SSH minion
 
   Scenario: Clean up sumaform leftovers on a SLE Micro SSH 5.3 SSH minion
     When I perform a full salt minion cleanup on "slemicro53_ssh_minion"
+    And I reboot the "slemicro53_ssh_minion" host through SSH, waiting until it comes back
 
   Scenario: Log in as admin user
     Given I am authorized for the "Admin" section

testsuite/features/build_validation/init_clients/slemicro54_minion.feature

@@ -9,6 +9,7 @@ Feature: Bootstrap a SLE Micro 5.4 Salt minion
 
   Scenario: Clean up sumaform leftovers on a SLE Micro 5.4 minion
     When I perform a full salt minion cleanup on "slemicro54_minion"
+    And I reboot the "slemicro54_minion" host through SSH, waiting until it comes back
 
   Scenario: Log in as admin user
     Given I am authorized for the "Admin" section

testsuite/features/build_validation/init_clients/slemicro54_ssh_minion.feature

@@ -9,6 +9,7 @@ Feature: Bootstrap a SLE Micro 5.4 Salt SSH minion
 
   Scenario: Clean up sumaform leftovers on a SLE Micro SSH 5.4 SSH minion
     When I perform a full salt minion cleanup on "slemicro54_ssh_minion"
+    And I reboot the "slemicro54_ssh_minion" host through SSH, waiting until it comes back
 
   Scenario: Log in as admin user
     Given I am authorized for the "Admin" section

testsuite/features/build_validation/init_clients/slemicro55_minion.feature

@@ -9,6 +9,7 @@ Feature: Bootstrap a SLE Micro 5.5 Salt minion
 
   Scenario: Clean up sumaform leftovers on a SLE Micro 5.5 minion
     When I perform a full salt minion cleanup on "slemicro55_minion"
+    And I reboot the "slemicro55_minion" host through SSH, waiting until it comes back
 
   Scenario: Log in as admin user
     Given I am authorized for the "Admin" section

testsuite/features/build_validation/init_clients/slemicro55_ssh_minion.feature

@@ -9,6 +9,7 @@ Feature: Bootstrap a SLE Micro 5.5 Salt SSH minion
 
   Scenario: Clean up sumaform leftovers on a SLE Micro SSH 5.5 SSH minion
     When I perform a full salt minion cleanup on "slemicro55_ssh_minion"
+    And I reboot the "slemicro55_ssh_minion" host through SSH, waiting until it comes back
 
   Scenario: Log in as admin user
     Given I am authorized for the "Admin" section