Skip to content

Commit 9a6213f

Browse files
committed
change(ci): Overhaul CI test flow management
1 parent b20655a commit 9a6213f

File tree

507 files changed

+2031
-1925
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

507 files changed

+2031
-1925
lines changed

.github/CODEOWNERS

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,9 @@
7272
/libraries/Wire/ @me-no-dev
7373
/libraries/Zigbee/ @P-R-O-C-H-Y
7474

75-
# CI JSON
75+
# CI YAML
7676
# Keep this after other libraries and tests to avoid being overridden.
77-
**/ci.json @lucasssvaz
77+
**/ci.yml @lucasssvaz
7878

7979
# The CODEOWNERS file should be owned by the developers of the ESP32 Arduino Core.
8080
# Leave this entry as the last one to avoid being overridden.
Lines changed: 265 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,265 @@
1+
#!/usr/bin/env python3
2+
3+
import json
4+
import os
5+
import re
6+
import sys
7+
from pathlib import Path
8+
from xml.etree.ElementTree import Element, SubElement, ElementTree
9+
import yaml
10+
11+
12+
def parse_array(value) -> list[str]:
13+
if isinstance(value, list):
14+
return [str(x) for x in value]
15+
if not isinstance(value, str):
16+
return []
17+
txt = value.strip()
18+
if not txt:
19+
return []
20+
# Try JSON
21+
try:
22+
return [str(x) for x in json.loads(txt)]
23+
except Exception:
24+
pass
25+
# Normalize single quotes then JSON
26+
try:
27+
fixed = txt.replace("'", '"')
28+
return [str(x) for x in json.loads(fixed)]
29+
except Exception:
30+
pass
31+
# Fallback: CSV
32+
return [p.strip() for p in txt.strip("[]").split(",") if p.strip()]
33+
34+
35+
def _parse_ci_yml(content: str) -> dict:
36+
if not content:
37+
return {}
38+
try:
39+
data = yaml.safe_load(content) or {}
40+
if not isinstance(data, dict):
41+
return {}
42+
return data
43+
except Exception:
44+
return {}
45+
46+
47+
def _fqbn_counts_from_yaml(ci: dict) -> dict[str, int]:
48+
counts: dict[str, int] = {}
49+
if not isinstance(ci, dict):
50+
return counts
51+
fqbn = ci.get("fqbn")
52+
if not isinstance(fqbn, dict):
53+
return counts
54+
for target, entries in fqbn.items():
55+
if isinstance(entries, list):
56+
counts[str(target)] = len(entries)
57+
elif entries is not None:
58+
# Single value provided as string
59+
counts[str(target)] = 1
60+
return counts
61+
62+
63+
def _sdkconfig_meets(ci_cfg: dict, sdk_text: str) -> bool:
64+
if not sdk_text:
65+
return True
66+
for req in ci_cfg.get("requires", []):
67+
if not req or not isinstance(req, str):
68+
continue
69+
if not any(line.startswith(req) for line in sdk_text.splitlines()):
70+
return False
71+
req_any = ci_cfg.get("requires_any", [])
72+
if req_any:
73+
if not any(any(line.startswith(r.strip()) for line in sdk_text.splitlines()) for r in req_any if isinstance(r, str)):
74+
return False
75+
return True
76+
77+
78+
def expected_from_artifacts(build_root: Path) -> dict[tuple[str, str, str, str], int]:
79+
"""Compute expected runs using ci.yml and sdkconfig found in build artifacts.
80+
Returns mapping (platform, target, type, sketch) -> expected_count
81+
"""
82+
expected: dict[tuple[str, str, str, str], int] = {}
83+
if not build_root.exists():
84+
return expected
85+
print(f"[DEBUG] Scanning build artifacts in: {build_root}", file=sys.stderr)
86+
for artifact_dir in build_root.iterdir():
87+
if not artifact_dir.is_dir():
88+
continue
89+
m = re.match(r"test-bin-([A-Za-z0-9_\-]+)-([A-Za-z0-9_\-]+)", artifact_dir.name)
90+
if not m:
91+
continue
92+
target = m.group(1)
93+
test_type = m.group(2)
94+
print(f"[DEBUG] Artifact group target={target} type={test_type} dir={artifact_dir}", file=sys.stderr)
95+
# Locate ci.yml next to build*.tmp folders and derive sketch/target
96+
for ci_path in artifact_dir.rglob("ci.yml"):
97+
if not ci_path.is_file():
98+
continue
99+
build_tmp = ci_path.parent
100+
if not re.search(r"build\d*\.tmp$", build_tmp.name):
101+
continue
102+
sketch = build_tmp.parent.name
103+
target_guess = build_tmp.parent.parent.name if build_tmp.parent.parent else ""
104+
if target_guess != target:
105+
continue
106+
sdk_path = build_tmp / "sdkconfig"
107+
try:
108+
ci_text = ci_path.read_text(encoding="utf-8") if ci_path.exists() else ""
109+
except Exception:
110+
ci_text = ""
111+
try:
112+
sdk_text = sdk_path.read_text(encoding="utf-8", errors="ignore") if sdk_path.exists() else ""
113+
except Exception:
114+
sdk_text = ""
115+
ci = _parse_ci_yml(ci_text)
116+
fqbn_counts = _fqbn_counts_from_yaml(ci)
117+
# Determine allowed platforms for this test
118+
allowed_platforms = []
119+
platforms_cfg = ci.get("platforms") if isinstance(ci, dict) else None
120+
for plat in ("hardware", "wokwi", "qemu"):
121+
dis = None
122+
if isinstance(platforms_cfg, dict):
123+
dis = platforms_cfg.get(plat)
124+
if dis is False:
125+
continue
126+
allowed_platforms.append(plat)
127+
# Requirements check
128+
minimal = {
129+
"requires": ci.get("requires") or [],
130+
"requires_any": ci.get("requires_any") or [],
131+
}
132+
if not _sdkconfig_meets(minimal, sdk_text):
133+
print(f"[DEBUG] Skip (requirements not met): target={target} type={test_type} sketch={sketch}", file=sys.stderr)
134+
continue
135+
# Expected runs per target driven by fqbn count; default 1 when 0
136+
exp_runs = fqbn_counts.get(target, 0) or 1
137+
for plat in allowed_platforms:
138+
expected[(plat, target, test_type, sketch)] = max(expected.get((plat, target, test_type, sketch), 0), exp_runs)
139+
print(f"[DEBUG] Expected: plat={plat} target={target} type={test_type} sketch={sketch} runs={exp_runs}", file=sys.stderr)
140+
return expected
141+
142+
143+
def scan_executed_xml(xml_root: Path, valid_types: set[str]) -> dict[tuple[str, str, str, str], int]:
144+
"""Return executed counts per (platform, target, type, sketch).
145+
Type/sketch/target are inferred from .../<type>/<sketch>/<target>/<file>.xml
146+
"""
147+
counts: dict[tuple[str, str, str, str], int] = {}
148+
if not xml_root.exists():
149+
print(f"[DEBUG] Results root not found: {xml_root}", file=sys.stderr)
150+
return counts
151+
print(f"[DEBUG] Scanning executed XMLs in: {xml_root}", file=sys.stderr)
152+
for xml_path in xml_root.rglob("*.xml"):
153+
if not xml_path.is_file():
154+
continue
155+
rel = str(xml_path)
156+
platform = "hardware"
157+
if "test-results-wokwi-" in rel:
158+
platform = "wokwi"
159+
elif "test-results-qemu-" in rel:
160+
platform = "qemu"
161+
# Expect .../<type>/<sketch>/<target>/*.xml
162+
parts = xml_path.parts
163+
t_idx = -1
164+
for i, p in enumerate(parts):
165+
if p in valid_types:
166+
t_idx = i
167+
if t_idx == -1 or t_idx + 3 >= len(parts):
168+
continue
169+
test_type = parts[t_idx]
170+
sketch = parts[t_idx + 1]
171+
target = parts[t_idx + 2]
172+
key = (platform, target, test_type, sketch)
173+
counts[key] = counts.get(key, 0) + 1
174+
print(f"[DEBUG] Executed entries discovered: {len(counts)}", file=sys.stderr)
175+
return counts
176+
177+
178+
def write_missing_xml(out_root: Path, platform: str, target: str, test_type: str, sketch: str, missing_count: int):
179+
out_tests_dir = out_root / f"test-results-{platform}" / "tests" / test_type / sketch / target
180+
out_tests_dir.mkdir(parents=True, exist_ok=True)
181+
# Create one XML per missing index
182+
for idx in range(missing_count):
183+
suite_name = f"{test_type}_{platform}_{target}_{sketch}"
184+
root = Element("testsuite", name=suite_name, tests="1", failures="1", errors="0")
185+
case = SubElement(root, "testcase", classname=f"{test_type}.{sketch}", name="missing-run")
186+
fail = SubElement(case, "failure", message="Expected test run missing")
187+
fail.text = "This placeholder indicates an expected test run did not execute."
188+
tree = ElementTree(root)
189+
out_file = out_tests_dir / f"{sketch}_missing_{idx}.xml"
190+
tree.write(out_file, encoding="utf-8", xml_declaration=True)
191+
192+
193+
def main():
194+
# Args: <build_artifacts_dir> <test_results_dir> <output_junit_dir>
195+
if len(sys.argv) != 4:
196+
print(f"Usage: {sys.argv[0]} <build_artifacts_dir> <test_results_dir> <output_junit_dir>", file=sys.stderr)
197+
return 2
198+
199+
build_root = Path(sys.argv[1]).resolve()
200+
results_root = Path(sys.argv[2]).resolve()
201+
out_root = Path(sys.argv[3]).resolve()
202+
203+
# Validate inputs
204+
if not build_root.is_dir():
205+
print(f"ERROR: Build artifacts directory not found: {build_root}", file=sys.stderr)
206+
return 2
207+
if not results_root.is_dir():
208+
print(f"ERROR: Test results directory not found: {results_root}", file=sys.stderr)
209+
return 2
210+
# Ensure output directory exists
211+
try:
212+
out_root.mkdir(parents=True, exist_ok=True)
213+
except Exception as e:
214+
print(f"ERROR: Failed to create output directory {out_root}: {e}", file=sys.stderr)
215+
return 2
216+
217+
# Read matrices from environment variables injected by workflow
218+
hw_enabled = (os.environ.get("HW_TESTS_ENABLED", "false").lower() == "true")
219+
wokwi_enabled = (os.environ.get("WOKWI_TESTS_ENABLED", "false").lower() == "true")
220+
qemu_enabled = (os.environ.get("QEMU_TESTS_ENABLED", "false").lower() == "true")
221+
222+
hw_targets = parse_array(os.environ.get("HW_TARGETS", "[]"))
223+
wokwi_targets = parse_array(os.environ.get("WOKWI_TARGETS", "[]"))
224+
qemu_targets = parse_array(os.environ.get("QEMU_TARGETS", "[]"))
225+
226+
hw_types = parse_array(os.environ.get("HW_TYPES", "[]"))
227+
wokwi_types = parse_array(os.environ.get("WOKWI_TYPES", "[]"))
228+
qemu_types = parse_array(os.environ.get("QEMU_TYPES", "[]"))
229+
230+
expected = expected_from_artifacts(build_root) # (platform, target, type, sketch) -> expected_count
231+
executed_types = set(hw_types + wokwi_types + qemu_types)
232+
executed = scan_executed_xml(results_root, executed_types) # (platform, target, type, sketch) -> count
233+
print(f"[DEBUG] Expected entries computed: {len(expected)}", file=sys.stderr)
234+
235+
# Filter expected by enabled platforms and target/type matrices
236+
enabled_plats = set()
237+
if hw_enabled:
238+
enabled_plats.add("hardware")
239+
if wokwi_enabled:
240+
enabled_plats.add("wokwi")
241+
if qemu_enabled:
242+
enabled_plats.add("qemu")
243+
244+
target_set = set(hw_targets + wokwi_targets + qemu_targets)
245+
type_set = set(hw_types + wokwi_types + qemu_types)
246+
247+
missing_total = 0
248+
for (plat, target, test_type, sketch), exp_count in expected.items():
249+
if plat not in enabled_plats:
250+
continue
251+
if target not in target_set or test_type not in type_set:
252+
continue
253+
got = executed.get((plat, target, test_type, sketch), 0)
254+
if got < exp_count:
255+
print(f"[DEBUG] Missing: plat={plat} target={target} type={test_type} sketch={sketch} expected={exp_count} got={got}", file=sys.stderr)
256+
write_missing_xml(out_root, plat, target, test_type, sketch, exp_count - got)
257+
missing_total += (exp_count - got)
258+
259+
print(f"Generated {missing_total} placeholder JUnit files for missing runs.", file=sys.stderr)
260+
261+
262+
if __name__ == "__main__":
263+
sys.exit(main())
264+
265+

.github/scripts/get_affected.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@
6363
Build file patterns
6464
--------------------
6565
- **build_files**: Core Arduino build system files (platform.txt, variants/**, etc.)
66-
- **sketch_build_files**: Sketch-specific files (ci.json, *.csv in example directories)
66+
- **sketch_build_files**: Sketch-specific files (ci.yml, *.csv in example directories)
6767
- **idf_build_files**: Core IDF build system files (CMakeLists.txt, idf_component.yml, etc.)
6868
- **idf_project_files**: Project-specific IDF files (per-example CMakeLists.txt, sdkconfig, etc.)
6969
@@ -128,7 +128,7 @@
128128
# Files that are used by the sketch build system.
129129
# If any of these files change, the sketch should be recompiled.
130130
sketch_build_files = [
131-
"libraries/*/examples/**/ci.json",
131+
"libraries/*/examples/**/ci.yml",
132132
"libraries/*/examples/**/*.csv",
133133
]
134134

@@ -150,7 +150,7 @@
150150
# If any of these files change, the example that uses them should be recompiled.
151151
idf_project_files = [
152152
"idf_component_examples/*/CMakeLists.txt",
153-
"idf_component_examples/*/ci.json",
153+
"idf_component_examples/*/ci.yml",
154154
"idf_component_examples/*/*.csv",
155155
"idf_component_examples/*/sdkconfig*",
156156
"idf_component_examples/*/main/*",

.github/scripts/on-push-idf.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ fi
1717

1818
for example in $affected_examples; do
1919
example_path="$PWD/components/arduino-esp32/$example"
20-
if [ -f "$example_path/ci.json" ]; then
20+
if [ -f "$example_path/ci.yml" ]; then
2121
# If the target is listed as false, skip the sketch. Otherwise, include it.
22-
is_target=$(jq -r --arg target "$IDF_TARGET" '.targets[$target]' "$example_path/ci.json")
22+
is_target=$(yq eval ".targets.${IDF_TARGET}" "$example_path/ci.yml" 2>/dev/null)
2323
if [[ "$is_target" == "false" ]]; then
2424
printf "\n\033[93mSkipping %s for target %s\033[0m\n\n" "$example" "$IDF_TARGET"
2525
continue

0 commit comments

Comments
 (0)