fix(hw): Properly group missing runners

Author: lucasssvaz

.gitlab/scripts/gen_hw_jobs.py

@@ -83,12 +83,11 @@ def find_sketch_test_dirs(types_filter: list[str]) -> list[tuple[str, Path]]:
 def load_tags_for_test(ci_json: dict, chip: str) -> set[str]:
     tags = set()
     # Global tags
-    for key in "tags":
-        v = ci_json.get(key)
-        if isinstance(v, list):
-            for e in v:
-                if isinstance(e, str) and e.strip():
-                    tags.add(e.strip())
+    v = ci_json.get("tags")
+    if isinstance(v, list):
+        for e in v:
+            if isinstance(e, str) and e.strip():
+                tags.add(e.strip())
     # Per-SoC tags
     soc_tags = ci_json.get("soc_tags")
     if isinstance(soc_tags, dict):
@@ -360,11 +359,24 @@ def main():
     # Discover available runners (best-effort)
     available_runners = list_project_runners()
     if not available_runners:
-        print("[WARN] Could not enumerate project runners or none found; skipping runner-tag availability checks.")
+        print("[WARN] Could not enumerate project runners or none found; using conservative mode for tagged groups.")
+    else:
+        print(f"\n=== Available Runners ({len(available_runners)}) ===")
+        for runner in available_runners:
+            runner_id = runner.get("id", "?")
+            runner_desc = runner.get("description", "")
+            runner_tags = runner.get("tag_list", [])
+            runner_active = runner.get("active", False)
+            runner_paused = runner.get("paused", False)
+            status = "ACTIVE" if (runner_active and not runner_paused) else "INACTIVE/PAUSED"
+            print(f"  Runner #{runner_id} ({status}): {runner_desc}")
+            print(f"    Tags: {', '.join(runner_tags) if runner_tags else '(none)'}")
+        print("=" * 60 + "\n")
 
     # Accumulate all missing-runner groups to emit a single stub job
     missing_groups: list[dict] = []
 
+    print(f"\n=== Test Group Scheduling ===")
     for (chip, tagset, test_type), test_dirs in group_map.items():
         tag_list = sorted(tagset)
         # Build name suffix excluding the SOC itself to avoid duplication
@@ -375,6 +387,25 @@ def main():
         can_schedule = True
         if available_runners:
             can_schedule = any_runner_matches(tag_list, available_runners)
+            print(f"  Group: {chip}-{test_type}-{tag_suffix}")
+            print(f"    Required tags: {', '.join(tag_list)}")
+            print(f"    Tests: {len(test_dirs)}")
+            if can_schedule:
+                print(f"    ✓ Runner found")
+            else:
+                print(f"    ✗ NO RUNNER FOUND - will create error report stub")
+        else:
+            # Conservative mode when we cannot list runners: treat groups that require extra
+            # tags beyond the SOC or 'generic' as missing-runner to avoid running on generic.
+            assume_missing = os.environ.get("ASSUME_TAGGED_GROUPS_MISSING", "1") == "1"
+            if assume_missing:
+                extra = [t for t in tag_list if t not in (chip, "generic")]
+                if extra:
+                    can_schedule = False
+            print(f"  Group: {chip}-{test_type}-{tag_suffix}")
+            print(f"    Required tags: {', '.join(tag_list)}")
+            print(f"    Tests: {len(test_dirs)}")
+            print(f"    ? Conservative mode: {'can schedule' if can_schedule else 'treating as missing'}")
 
         if can_schedule:
             job_name = f"hw-{chip}-{test_type}-{tag_suffix}"[:255]
@@ -403,6 +434,20 @@ def main():
                 }
             )
 
+    # Print summary
+    scheduled_count = len([e for e in jobs_entries if e[1] != "hw-missing-runners"])
+    print(f"\n=== Summary ===")
+    print(f"  Scheduled groups: {scheduled_count}")
+    print(f"  Missing runner groups: {len(missing_groups)}")
+    if missing_groups:
+        print(f"\n  Missing runner details:")
+        for mg in missing_groups:
+            chip = mg.get("chip")
+            test_type = mg.get("test_type")
+            tags = mg.get("required_tags", [])
+            test_count = len(mg.get("test_dirs", []))
+            print(f"    - {chip}-{test_type}: requires tags {tags}, {test_count} tests")
+
     # If any groups are missing runners, create one combined stub job to emit all JUnit errors
     if missing_groups:
         job_name = "hw-missing-runners"

.gitlab/workflows/hardware_tests_dynamic.yml

@@ -18,7 +18,13 @@ generate-hw-tests:
   before_script:
     - pip install PyYAML
     - apt-get update
-    - apt-get install -y jq yq unzip curl
+    - apt-get install -y jq unzip curl wget
+    # Install mikefarah/yq (Go version) instead of kislyuk/yq (Python version)
+    - YQ_VERSION=v4.47.2
+    - YQ_BINARY=yq_linux_amd64
+    - wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/${YQ_BINARY} -O /usr/bin/yq
+    - chmod +x /usr/bin/yq
+    - yq --version
   script:
     - mkdir -p ~/.arduino/tests
     - |
@@ -65,7 +71,7 @@ collect-hw-results:
     - if: $CI_PIPELINE_SOURCE == "trigger"
       when: always
   before_script:
-    - apt-get update && apt-get install -y jq yq curl unzip
+    - apt-get update && apt-get install -y jq curl unzip
   script:
     - bash .gitlab/scripts/get_results.sh
   artifacts:

.gitlab/workflows/hw_test_template.yml

@@ -34,7 +34,13 @@ hw-test-template:
     - echo "Pipeline ID:$PIPELINE_ID"
     - echo "Running hardware tests for chip:$TEST_CHIP"
     - apt-get update
-    - apt-get install -y jq yq unzip curl
+    - apt-get install -y jq unzip curl wget
+    # Install mikefarah/yq (Go version) instead of kislyuk/yq (Python version)
+    - YQ_VERSION=v4.47.2
+    - YQ_BINARY=yq_linux_amd64
+    - wget https://github.com/mikefarah/yq/releases/download/${YQ_VERSION}/${YQ_BINARY} -O /usr/bin/yq
+    - chmod +x /usr/bin/yq
+    - yq --version
     - rm -rf ~/.arduino/tests
     - mkdir -p ~/.arduino/tests/$TEST_CHIP
     - echo Fetching binaries for $TEST_CHIP $TEST_TYPE

tests/validation/psram/ci.yml

@@ -7,6 +7,7 @@ soc_tags:
     - octal_psram
   esp32c5:
     - psram
+  # Runners for ESP32-P4 have PSRAM by default. There are no runners with psram tag.
 
 platforms:
   qemu: false