Merge branch 'ci/backport-master-6.0-20251204' into 'release/v6.0'

Ci/backport master 6.0 20251204

See merge request espressif/esp-idf!43993

.gitlab/ci/build.yml

@@ -72,8 +72,6 @@ build_template_app:
       #
       # keep the log file to help debug
       - "**/build*/build_log.txt"
-      # keep the size info to help track the binary size
-      - size_info.txt
       - "**/build*/size*.json"
     expire_in: 1 week
     when: always

.idf_ci.toml

@@ -99,7 +99,7 @@ patterns = [
 
 [gitlab.artifacts.s3.longterm]
 bucket = "longterm"
-if_clause = '"$CI_COMMIT_REF_NAME" == "master"'
+if_clause = 'CI_COMMIT_REF_NAME == "master"'
 patterns = [
     '**/build*/size*.json',
 ]

pytest.ini

@@ -131,3 +131,4 @@ env_markers =
     esp32c2eco4: esp32c2 major version(v2.0) chips
     recovery_bootloader: Runner with recovery bootloader offset set in
     esp32p4_eco4: Runner with esp32p4 eco4 connected
+    eco_default: Runner with default eco connected

tools/ci/idf_ci_local/app.py

@@ -41,9 +41,7 @@ class IdfCMakeApp(CMakeApp):
             )
             rmdir(
                 self.build_path,
-                exclude_file_patterns=[
-                    'build_log.txt',
-                ],
+                exclude_file_patterns=['build_log.txt', 'size*.json'],
             )
 
 

tools/ci/idf_pytest/constants.py

@@ -4,8 +4,6 @@
 Pytest Related Constants. Don't import third-party packages here.
 """
 
-import typing as t
-
 SUPPORTED_TARGETS = [
     'esp32',
     'esp32s2',
@@ -18,7 +16,7 @@ SUPPORTED_TARGETS = [
     'esp32c5',
     'esp32c61',
 ]
-PREVIEW_TARGETS: t.List[str] = []  # this PREVIEW_TARGETS excludes 'linux' target
+PREVIEW_TARGETS: list[str] = []  # this PREVIEW_TARGETS excludes 'linux' target
 
 DEFAULT_LOGDIR = 'pytest-embedded'
 
@@ -26,3 +24,10 @@ DEFAULT_LOGDIR = 'pytest-embedded'
 TIMEOUT_4H_MARKERS = [
     'ethernet_stress',
 ]
+
+ECO_MARKERS = [
+    'esp32eco3',
+    'esp32c2eco4',
+    'esp32c3eco7',
+    'esp32p4_eco4',
+]

tools/ci/idf_pytest/plugin.py

@@ -20,6 +20,7 @@ from pytest_embedded.utils import find_by_suffix
 from pytest_ignore_test_results.ignore_results import ChildCase
 from pytest_ignore_test_results.ignore_results import ChildCasesStashKey
 
+from .constants import ECO_MARKERS
 from .utils import format_case_id
 from .utils import merge_junit_files
 from .utils import normalize_testcase_file_path
@@ -164,6 +165,12 @@ class IdfLocalPlugin:
             if 'esp32c2' in case.targets and 'xtal_26mhz' not in case.all_markers:
                 item.add_marker('xtal_40mhz')
 
+            for eco_marker in ECO_MARKERS:
+                if eco_marker in case.all_markers:
+                    break
+            else:
+                item.add_marker('eco_default')
+
             if 'host_test' in case.all_markers:
                 item.add_marker('skip_app_downloader')  # host_test jobs will build the apps itself