commit 343cc786737535728d28f8ede362a9a911de6f27
author George Keishing <gkeishin@in.ibm.com> Thu Mar 18 15:51:45 2021 +0000
committer George Keishing <gkeishin@in.ibm.com> Thu Mar 18 15:51:45 2021 +0000
tree 9b0780831c68c06af70910262301d3ba2efeb1ca
parent cb6b53b8c90fdc4636acfc2e1824831a8a9f532b

Revert "Pass in REDFISH_SUPPORT_TRANS_STATE to robot_cmd_fnc"

This reverts commit cb6b53b8c90fdc4636acfc2e1824831a8a9f532b.

Reason for revert: Works good from sandbox but not on Jenkins HW CI

Change-Id: I411a7b08a131936c089b69dbeb3ed62a72f59786

bin/plug_ins/Auto_reboot/cp_master

diff --git a/bin/plug_ins/Auto_reboot/cp_master b/bin/plug_ins/Auto_reboot/cp_master
index 2f4851e..5d2a707 100755
--- a/bin/plug_ins/Auto_reboot/cp_master
+++ b/bin/plug_ins/Auto_reboot/cp_master
@@ -6,7 +6,6 @@
 
 import os
 import sys
-from robot.libraries.BuiltIn import BuiltIn
 
 save_dir_path = sys.path.pop(0)
 
@@ -35,12 +34,6 @@
 
 AUTO_REBOOT_DISABLE = "1"
 
-REDFISH_SUPPORT_TRANS_STATE = int(os.environ.get('REDFISH_SUPPORT_TRANS_STATE', 0))
-try:
-    REDFISH_SUPPORT_TRANS_STATE = REDFISH_SUPPORT_TRANS_STATE or \
-        int(BuiltIn().get_variable_value("${REDFISH_SUPPORT_TRANS_STATE}", default=0))
-except:
-    pass
 
 def validate_parms():
 
@@ -80,9 +73,8 @@
 
     cmd_buf = create_robot_cmd_string("extended/run_keyword.robot", OPENBMC_HOST, SSH_PORT, HTTPS_PORT,
                                       REST_USERNAME, REST_PASSWORD, OPENBMC_USERNAME, OPENBMC_PASSWORD,
-                                      REDFISH_SUPPORT_TRANS_STATE, keyword_string, lib_file_path, quiet,
+                                      keyword_string, lib_file_path, quiet,
                                       test_mode, debug, outputdir, output, log, report)
-
     if not robot_cmd_fnc(cmd_buf):
         print_error_report("Robot command execution failed.")
         exit(1)

lib/obmc_boot_test.py

diff --git a/lib/obmc_boot_test.py b/lib/obmc_boot_test.py
index 5ba505a..ccc81c4 100755
--- a/lib/obmc_boot_test.py
+++ b/lib/obmc_boot_test.py
@@ -66,8 +66,6 @@
 status_dir_path = os.environ.get('STATUS_DIR_PATH', "")
 if status_dir_path != "":
     status_dir_path = os.path.normpath(status_dir_path) + os.sep
-redfish_support_trans_state = int(os.environ.get('REDFISH_SUPPORT_TRANS_STATE', 0)) or \
-    int(BuiltIn().get_variable_value("${REDFISH_SUPPORT_TRANS_STATE}", default=0))
 redfish_supported = BuiltIn().get_variable_value("${REDFISH_SUPPORTED}", default=False)
 redfish_rest_supported = BuiltIn().get_variable_value("${REDFISH_REST_SUPPORTED}", default=False)
 if redfish_supported:
@@ -274,7 +272,7 @@
                          "status_dir_path", "base_tool_dir_path",
                          "ffdc_list_file_path", "ffdc_report_list_path",
                          "ffdc_summary_list_path", "execdir", "redfish_supported",
-                         "redfish_rest_supported", "redfish_support_trans_state"]
+                         "redfish_rest_supported"]
 
     plug_in_vars = parm_list + additional_values