commit 12de0947bcd8a2e4b12c9beb074d538bebf466b9
author George Keishing <gkeishin@in.ibm.com> Fri Dec 08 17:02:13 2023 +0530
committer George Keishing <gkeishin@in.ibm.com> Fri Dec 08 17:19:26 2023 +0530
tree 4dd5b668766f1b9f18ccb8c126db93ac443ddbdd
parent 283ae8a139f6dbe3b2d23f7e89dbe3aabcf0b2cf

openbmctool deprecated code support removal

Changes:
   - Remove openbmctool related codes from repository

Tested:
  - For sanity, ran from sandbox HW CI test bucket

Change-Id: I0a5e3db2bcbcdbc9680dfd69743f1d397a1f08b3
Signed-off-by: George Keishing <gkeishin@in.ibm.com>

lib/gen_call_robot.py

diff --git a/lib/gen_call_robot.py b/lib/gen_call_robot.py
index e873c52..91231bf 100755
--- a/lib/gen_call_robot.py
+++ b/lib/gen_call_robot.py
@@ -164,22 +164,10 @@
                 # Use to the apollo dir path.
                 ROBOT_TEST_BASE_DIR_PATH = apollo_dir_path + suffix
 
-    OBMC_TOOLS_BASE_DIR_PATH = (
-        os.path.dirname(ROBOT_TEST_BASE_DIR_PATH.rstrip("/"))
-        + "/openbmc-tools/"
-    )
-    OPENBMCTOOL_DIR_PATH = OBMC_TOOLS_BASE_DIR_PATH + "openbmctool/"
-    JSON_CHECKER_TOOLS_DIR_PATH = (
-        OBMC_TOOLS_BASE_DIR_PATH + "expectedJsonChecker/"
-    )
-
     gv.valid_value(ROBOT_TEST_BASE_DIR_PATH)
     gp.dprint_vars(
         ROBOT_TEST_RUNNING_FROM_SB,
         ROBOT_TEST_BASE_DIR_PATH,
-        OBMC_TOOLS_BASE_DIR_PATH,
-        OPENBMCTOOL_DIR_PATH,
-        JSON_CHECKER_TOOLS_DIR_PATH,
     )
     gv.valid_dir_path(ROBOT_TEST_BASE_DIR_PATH)
 
@@ -190,17 +178,6 @@
     gm.set_mod_global(ROBOT_TEST_RUNNING_FROM_SB)
     os.environ["ROBOT_TEST_RUNNING_FROM_SB"] = str(ROBOT_TEST_RUNNING_FROM_SB)
 
-    gm.set_mod_global(OBMC_TOOLS_BASE_DIR_PATH)
-    os.environ["OBMC_TOOLS_BASE_DIR_PATH"] = str(OBMC_TOOLS_BASE_DIR_PATH)
-
-    gm.set_mod_global(OPENBMCTOOL_DIR_PATH)
-    os.environ["OPENBMCTOOL_DIR_PATH"] = str(OPENBMCTOOL_DIR_PATH)
-
-    gm.set_mod_global(JSON_CHECKER_TOOLS_DIR_PATH)
-    os.environ["JSON_CHECKER_TOOLS_DIR_PATH"] = str(
-        JSON_CHECKER_TOOLS_DIR_PATH
-    )
-
 
 raw_robot_file_search_path = (
     "${ROBOT_TEST_BASE_DIR_PATH}:"
@@ -467,7 +444,6 @@
     ROBOT_TEST_RUNNING_FROM_SB = gm.get_mod_global(
         "ROBOT_TEST_RUNNING_FROM_SB"
     )
-    OPENBMCTOOL_DIR_PATH = gm.get_mod_global("OPENBMCTOOL_DIR_PATH")
 
     if robot_jail == "":
         if ROBOT_TEST_RUNNING_FROM_SB:
@@ -511,7 +487,6 @@
                 "/usr/bin",
                 "/sbin",
                 "/bin",
-                OPENBMCTOOL_DIR_PATH.rstrip("/"),
             ]
         )
         PATH = ":".join(NEW_PATH_LIST)
@@ -523,12 +498,7 @@
             + "lib"
         )
         PATH = (
-            os.environ.get("PATH", "")
-            + ":"
-            + ROBOT_TEST_BASE_DIR_PATH
-            + "bin"
-            + ":"
-            + OPENBMCTOOL_DIR_PATH.rstrip("/")
+            os.environ.get("PATH", "") + ":" + ROBOT_TEST_BASE_DIR_PATH + "bin"
         )
 
     os.environ["PYTHONPATH"] = PYTHONPATH