espressif/esp-idf
1
0
Fork 1
mirror of https://github.com/espressif/esp-idf.git synced 2025-08-04 05:04:33 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ci/fix-test-skip-ci-issue' into 'master'

Browse Source 
ci: fix temp_skip_ci issue where test job was not skipped

Closes IDFCI-3032

See merge request espressif/esp-idf!40628
This commit is contained in:
Igor Udot
2025-07-17 16:53:01 +08:00
parent 918b2cfd7e ab85534fb7
commit b65366d5c4
1 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
tools/ci/idf_pytest/plugin.py
View File

@@ -65,8 +65,22 @@ def skipped_targets(item: Function) -> t.Set[str]:
return set(to_list(temp_marker.kwargs['targets'])) return set(to_list(temp_marker.kwargs['targets']))
temp_skip_ci_targets = _get_temp_markers_disabled_targets('temp_skip_ci') _count = IdfLocalPlugin.get_param(item, 'count', 1)
temp_skip_targets = _get_temp_markers_disabled_targets('temp_skip')
def normalize_targets(target: str) -> str:
targets = target.split(',')
if len(targets) == 1:
return ','.join(targets * _count)
if len(targets) != _count:
raise ValueError(
f"Invalid target format: '{target}'. "
f'Expected a single target or exactly {_count} values separated by commas.'
f'len({targets}) != {_count}'
)
return target
temp_skip_ci_targets = set(normalize_targets(_t) for _t in _get_temp_markers_disabled_targets('temp_skip_ci'))
temp_skip_targets = set(normalize_targets(_t) for _t in _get_temp_markers_disabled_targets('temp_skip'))
# in CI we skip the union of `temp_skip` and `temp_skip_ci` # in CI we skip the union of `temp_skip` and `temp_skip_ci`
if os.getenv('CI_JOB_ID'): if os.getenv('CI_JOB_ID'):