minor updates

Author: dbasunag

conftest.py

@@ -29,7 +29,7 @@
     set_must_gather_collector_directory,
     set_must_gather_collector_values,
     get_must_gather_collector_dir,
-    collect_rhoai_must_gather,
+    collect_rhoai_must_gather, get_base_dir,
 )
 
 LOGGER = logging.getLogger(name=__name__)
@@ -223,7 +223,8 @@ def _add_upgrade_test(_item: Item, _upgrade_deployment_modes: list[str]) -> bool
 
 
 def pytest_sessionstart(session: Session) -> None:
-    tests_log_file = session.config.getoption("log_file") or "pytest-tests.log"
+    log_file = session.config.getoption("log_file") or "pytest-tests.log"
+    tests_log_file = os.path.join(get_base_dir(), log_file)
     if os.path.exists(tests_log_file):
         pathlib.Path(tests_log_file).unlink()
 
@@ -252,7 +253,6 @@ def pytest_runtest_setup(item: Item) -> None:
     BASIC_LOGGER.info(f"\n{separator(symbol_='-', val=item.name)}")
     BASIC_LOGGER.info(f"{separator(symbol_='-', val='SETUP')}")
     if item.config.getoption("--collect-must-gather"):
-        BASIC_LOGGER.info("I am here")
         # set must-gather collection directory:
         set_must_gather_collector_directory(item=item, directory_path=get_must_gather_collector_dir())
 
@@ -342,7 +342,8 @@ def pytest_sessionfinish(session: Session, exitstatus: int) -> None:
 def calculate_must_gather_timer(test_start_time: int) -> int:
     default_duration = 300
     if test_start_time > 0:
-        return int(datetime.datetime.now().strftime("%s")) - test_start_time
+        duration = int(datetime.datetime.now().strftime("%s")) - test_start_time
+        return duration if duration > 60 else default_duration
     else:
         LOGGER.warning(f"Could not get start time of test. Collecting must-gather for last {default_duration}s")
         return default_duration

utilities/database.py

@@ -3,7 +3,7 @@
 from sqlalchemy import Integer, String, create_engine
 from sqlalchemy.orm import Mapped, Session, mapped_column
 from sqlalchemy.orm import DeclarativeBase
-from utilities.must_gather_collector import get_must_gather_base_dir
+from utilities.must_gather_collector import get_base_dir
 
 LOGGER = logging.getLogger(__name__)
 
@@ -24,7 +24,7 @@ class OpenDataHubTestTable(Base):
 
 class Database:
     def __init__(self, database_file_name: str = TEST_DB, verbose: bool = True) -> None:
-        self.database_file_path = f"{get_must_gather_base_dir()}{database_file_name}"
+        self.database_file_path = f"{get_base_dir()}{database_file_name}"
         self.connection_string = f"sqlite:///{self.database_file_path}"
         self.verbose = verbose
         self.engine = create_engine(url=self.connection_string, echo=self.verbose)

utilities/must_gather_collector.py

@@ -11,13 +11,18 @@
 BASE_DIRECTORY_NAME = "must-gather-collected"
 
 
-def get_must_gather_base_dir() -> str:
-    return f"{'' if os.environ.get('LOCAL_RUN') else '/home/odh/opendatahub-tests/results/'}"
+def get_base_dir() -> str:
+    if os.path.exists('/home/odh/opendatahub-tests/'):
+        # we are running from jenkins.
+        return "/home/odh/opendatahub-tests/results"
+    else:
+        # this is local run
+        return ""
 
 
 def set_must_gather_collector_values() -> dict[str, str]:
     py_config["must_gather_collector"] = {
-        "must_gather_base_directory": f"{get_must_gather_base_dir()}{BASE_DIRECTORY_NAME}",
+        "must_gather_base_directory": f"{get_base_dir()}{BASE_DIRECTORY_NAME}",
     }
     return py_config["must_gather_collector"]