Merge branch 'ci/add-python-func-and-fix-c-testcase-path-in-junit-report' into 'master'

ci: add python_func attribute and fix C testcase path resolution in JUnit reports

Closes RDT-1013, IDFCI-1990, IDFCI-1964, and IDFCI-1429

See merge request espressif/esp-idf!35058

Author: alekseiapa

tools/ci/dynamic_pipelines/models.py

@@ -1,4 +1,4 @@
-# SPDX-FileCopyrightText: 2024 Espressif Systems (Shanghai) CO LTD
+# SPDX-FileCopyrightText: 2024-2025 Espressif Systems (Shanghai) CO LTD
 # SPDX-License-Identifier: Apache-2.0
 import inspect
 import os
@@ -8,6 +8,7 @@
 from xml.etree.ElementTree import Element
 
 import yaml
+from idf_ci_utils import IDF_PATH
 
 
 class Job:
@@ -130,6 +131,7 @@ class TestCase:
     name: str
     file: str
     time: float
+    app_path: t.Optional[str] = None
     failure: t.Optional[str] = None
     skipped: t.Optional[str] = None
     ci_job_url: t.Optional[str] = None
@@ -150,6 +152,13 @@ def is_skipped(self) -> bool:
     def is_success(self) -> bool:
         return not self.is_failure and not self.is_skipped
 
+    @classmethod
+    def _get_idf_rel_path(cls, path: str) -> str:
+        if path.startswith(IDF_PATH):
+            return os.path.relpath(path, IDF_PATH)
+        else:
+            return path
+
     @classmethod
     def from_test_case_node(cls, node: Element) -> t.Optional['TestCase']:
         if 'name' not in node.attrib:
@@ -163,6 +172,9 @@ def from_test_case_node(cls, node: Element) -> t.Optional['TestCase']:
         kwargs = {
             'name': node.attrib['name'],
             'file': node.attrib.get('file'),
+            'app_path': '|'.join(
+                cls._get_idf_rel_path(path) for path in node.attrib.get('app_path', 'unknown').split('|')
+            ),
             'time': float(node.attrib.get('time') or 0),
             'ci_job_url': node.attrib.get('ci_job_url') or 'Not found',
             'ci_dashboard_url': f'{grafana_base_url}?{encoded_params}',

tools/ci/dynamic_pipelines/report.py

@@ -788,15 +788,15 @@ def get_failed_cases_report_parts(self) -> t.List[str]:
             items=failed_test_cases_cur_branch,
             headers=[
                 'Test Case',
-                'Test Script File Path',
+                'Test App Path',
                 'Failure Reason',
                 f'Failures on your branch (40 latest testcases)',
                 'Dut Log URL',
                 'Create Known Failure Case Jira',
                 'Job URL',
                 'Grafana URL',
             ],
-            row_attrs=['name', 'file', 'failure', 'dut_log_url', 'ci_job_url', 'ci_dashboard_url'],
+            row_attrs=['name', 'app_path', 'failure', 'dut_log_url', 'ci_job_url', 'ci_dashboard_url'],
             value_functions=[
                 (
                     'Failures on your branch (40 latest testcases)',
@@ -813,15 +813,15 @@ def get_failed_cases_report_parts(self) -> t.List[str]:
             items=failed_test_cases_other_branch,
             headers=[
                 'Test Case',
-                'Test Script File Path',
+                'Test App Path',
                 'Failure Reason',
                 'Cases that failed in other branches as well (40 latest testcases)',
                 'Dut Log URL',
                 'Create Known Failure Case Jira',
                 'Job URL',
                 'Grafana URL',
             ],
-            row_attrs=['name', 'file', 'failure', 'dut_log_url', 'ci_job_url', 'ci_dashboard_url'],
+            row_attrs=['name', 'app_path', 'failure', 'dut_log_url', 'ci_job_url', 'ci_dashboard_url'],
             value_functions=[
                 (
                     'Cases that failed in other branches as well (40 latest testcases)',
@@ -836,8 +836,8 @@ def get_failed_cases_report_parts(self) -> t.List[str]:
         known_failures_cases_table_section = self.create_table_section(
             title=self.report_titles_map['failed_known'],
             items=known_failures,
-            headers=['Test Case', 'Test Script File Path', 'Failure Reason', 'Job URL', 'Grafana URL'],
-            row_attrs=['name', 'file', 'failure', 'ci_job_url', 'ci_dashboard_url'],
+            headers=['Test Case', 'Test App Path', 'Failure Reason', 'Job URL', 'Grafana URL'],
+            row_attrs=['name', 'app_path', 'failure', 'ci_job_url', 'ci_dashboard_url'],
         )
         failed_cases_report_url = self.write_report_to_file(
             self.generate_html_report(
@@ -870,8 +870,8 @@ def get_skipped_cases_report_parts(self) -> t.List[str]:
         skipped_cases_table_section = self.create_table_section(
             title=self.report_titles_map['skipped'],
             items=skipped_test_cases,
-            headers=['Test Case', 'Test Script File Path', 'Skipped Reason', 'Grafana URL'],
-            row_attrs=['name', 'file', 'skipped', 'ci_dashboard_url'],
+            headers=['Test Case', 'Test App Path', 'Skipped Reason', 'Grafana URL'],
+            row_attrs=['name', 'app_path', 'skipped', 'ci_dashboard_url'],
         )
         skipped_cases_report_url = self.write_report_to_file(
             self.generate_html_report(''.join(skipped_cases_table_section)),
@@ -892,8 +892,8 @@ def get_succeeded_cases_report_parts(self) -> t.List[str]:
         succeeded_cases_table_section = self.create_table_section(
             title=self.report_titles_map['succeeded'],
             items=succeeded_test_cases,
-            headers=['Test Case', 'Test Script File Path', 'Job URL', 'Grafana URL'],
-            row_attrs=['name', 'file', 'ci_job_url', 'ci_dashboard_url'],
+            headers=['Test Case', 'Test App Path', 'Job URL', 'Grafana URL'],
+            row_attrs=['name', 'app_path', 'ci_job_url', 'ci_dashboard_url'],
         )
         succeeded_cases_report_url = self.write_report_to_file(
             self.generate_html_report(''.join(succeeded_cases_table_section)),

tools/ci/dynamic_pipelines/templates/.dynamic_jobs.yml

@@ -56,7 +56,7 @@
     TARGET_SELECTOR: ""
     ENV_MARKERS: ""
     INSTALL_EXTRA_TOOLS: "xtensa-esp-elf-gdb riscv32-esp-elf-gdb openocd-esp32 esp-rom-elfs"
-    PYTEST_EXTRA_FLAGS: "--dev-passwd ${ETHERNET_TEST_PASSWORD} --dev-user ${ETHERNET_TEST_USER} --capture=fd --verbosity=0"
+    PYTEST_EXTRA_FLAGS: "--dev-passwd ${ETHERNET_TEST_PASSWORD} --dev-user ${ETHERNET_TEST_USER} --capture=fd --verbosity=0 --unity-test-report-mode merge"
   cache:
     # Usually do not need submodule-cache in target_test
     - key: pip-cache-${LATEST_GIT_TAG}