Add info about failed MG to email report

Signed-off-by: Petr Balogh <[email protected]>

ocs_ci/framework/pytest_customization/ocscilib.py

@@ -31,7 +31,7 @@
 )
 from ocs_ci.ocs.cluster import check_clusters
 from ocs_ci.ocs.resources.ocs import get_version_info
-from ocs_ci.ocs.utils import collect_ocs_logs, collect_prometheus_metrics, mg_fail_count
+from ocs_ci.ocs import utils
 from ocs_ci.utility.utils import (
     dump_config_to_file,
     get_ceph_version,
@@ -759,15 +759,15 @@ def pytest_runtest_makereport(item, call):
             "purple_squad",
         }
         # For every failure in MG we are trying to extend next attempt by 20 minutes
-        adjusted_timeout = mg_fail_count * 1200
+        adjusted_timeout = utils.mg_fail_count * 1200
         timeout = ocsci_config.REPORTING.get(
             "must_gather_timeout", 3600 + adjusted_timeout
         )
         log.info(f"Adjusted timeout for MG is {timeout} seconds")
         mcg_logs_collection = bool(mcg_markers_to_collect & item_markers)
         try:
             if not ocsci_config.RUN.get("is_ocp_deployment_failed"):
-                collect_ocs_logs(
+                utils.collect_ocs_logs(
                     dir_name=test_case_name,
                     ocp=ocp_logs_collection,
                     ocs=ocs_logs_collection,
@@ -789,7 +789,7 @@ def pytest_runtest_makereport(item, call):
         metrics = item.get_closest_marker("gather_metrics_on_fail").args
         try:
             threading_lock = call.getfixturevalue("threading_lock")
-            collect_prometheus_metrics(
+            utils.collect_prometheus_metrics(
                 metrics,
                 f"{item.name}-{call.when}",
                 call.start,

ocs_ci/utility/utils.py

@@ -1722,6 +1722,16 @@ def parse_html_for_email(soup):
         skipped[0].string.replace_with(
             f"{skipped_number} skipped ({skips_ceph_health_ratio * 100}% on Ceph health)"
         )
+    from ocs import utils
+
+    if utils.mg_fail_count:
+        failed_mg_text = soup.new_tag("b")
+        failed_mg_text.string = (
+            f"In this execution Must Gather collection has failed: {utils.mg_fail_count} times!"
+            " Please check why this has happened!"
+        )
+        main_header = soup.find("h1")
+        main_header.insert_after(failed_mg_text)
 
     main_header = soup.find("h1")
     main_header.string.replace_with("OCS-CI RESULTS")

tests/conftest.py

@@ -79,15 +79,7 @@
 from ocs_ci.ocs.resources.mcg_replication_policy import AwsLogBasedReplicationPolicy
 from ocs_ci.ocs.resources.mockup_bucket_logger import MockupBucketLogger
 from ocs_ci.ocs.scale_lib import FioPodScale
-from ocs_ci.ocs.utils import (
-    setup_ceph_toolbox,
-    collect_ocs_logs,
-    collect_pod_container_rpm_package,
-    get_dr_operator_versions,
-    mg_collected_types,
-    mg_collected_logs,
-    mg_fail_count,
-)
+from ocs_ci.ocs import utils
 from ocs_ci.ocs.resources.deployment import Deployment
 from ocs_ci.ocs.resources.job import get_job_obj
 from ocs_ci.ocs.resources.backingstore import (
@@ -1755,7 +1747,7 @@ def additional_testsuite_properties(record_testsuite_property, pytestconfig):
     # add markers as separated property
     markers = ocsci_config.RUN["cli_params"].get("-m", "").replace(" ", "-")
     record_testsuite_property("rp_markers", markers)
-    dr_operator_versions = get_dr_operator_versions()
+    dr_operator_versions = utils.get_dr_operator_versions()
     for dr_operator_name, dr_operator_version in dr_operator_versions.items():
         record_testsuite_property(f"rp_{dr_operator_name}", dr_operator_version)
 
@@ -4068,7 +4060,7 @@ def ceph_toolbox(request):
     ):
         try:
             # Creating toolbox pod
-            setup_ceph_toolbox()
+            utils.setup_ceph_toolbox()
         except CommandFailed:
             log.info("Failed to create toolbox")
 
@@ -4623,10 +4615,11 @@ def finalizer():
                 for mg_target in ["ocs", "ocp"]:
                     try:
                         if (
-                            mg_collected_logs
-                            and mg_target in mg_collected_types
+                            utils.mg_collected_logs
+                            and mg_target in utils.mg_collected_types
                             and (
-                                mg_fail_count < config.REPORTING["max_mg_fail_attempts"]
+                                utils.mg_fail_count
+                                < config.REPORTING["max_mg_fail_attempts"]
                             )
                         ):
                             log.info(
@@ -4637,7 +4630,7 @@ def finalizer():
                             if mg_target == "ocs":
                                 timeout = 7200
                             log.info("Collecting OCP logs on Success run!")
-                            collect_ocs_logs(
+                            utils.collect_ocs_logs(
                                 "testcases",
                                 ocs="ocs" == mg_target,
                                 ocp="ocp" == mg_target,
@@ -4650,7 +4643,7 @@ def finalizer():
                         failure_in_mg.append((mg_target, ex))
                         log.error(f"Failure in {mg_target}, {ex}")
             try:
-                collect_pod_container_rpm_package("testcases")
+                utils.collect_pod_container_rpm_package("testcases")
             except Exception as ex:
                 failure_in_mg.append(("rpm_package_info", ex))
                 log.error(f"Failure in {mg_target}, {ex}")