Fix SOL collection for CI.

Fixes:
   - Grouped SOL and "auto_reboot" setting.
   - Rename keyword changes.

Change-Id: I461300a25e0ef144c575b3f7091c8aa371521a7f
Signed-off-by: George Keishing <gkeishin@in.ibm.com>
diff --git a/tests/test_basic_poweron.robot b/tests/test_basic_poweron.robot
index d62396f..71d5e5f 100644
--- a/tests/test_basic_poweron.robot
+++ b/tests/test_basic_poweron.robot
@@ -5,7 +5,7 @@
 Resource            ../lib/utils.robot
 Resource            ../lib/state_manager.robot
 
-Test Setup          Start SOL Console Logging
+Test Setup          Test Setup Execution
 Test Teardown       Test Teardown Execution
 
 Force Tags  chassisboot
@@ -24,7 +24,6 @@
 Power On Test
     [Documentation]  Power off and on.
     [Tags]  Power_On_Test
-    [Setup]  Set Auto Reboot  ${0}
 
     Repeat Keyword  ${LOOP_COUNT} times  Host Off And On
 
@@ -41,6 +40,11 @@
 
 *** Keywords ***
 
+Test Setup Execution
+    [Documentation]  Do test case setup tasks.
+    Start SOL Console Logging
+    Set Auto Reboot  ${0}
+
 Test Teardown Execution
     [Documentation]  Collect FFDC and SOL log.
     FFDC On Test Case Fail