Merge branch 'ci/fixes'

Author: lucasssvaz

.github/scripts/tests_matrix.sh

@@ -3,24 +3,24 @@
 # QEMU is disabled for now
 qemu_enabled="false"
 
-build_types="'validation'"
-hw_types="'validation'"
-wokwi_types="'validation'"
-qemu_types="'validation'"
+build_types='"validation"'
+hw_types='"validation"'
+wokwi_types='"validation"'
+qemu_types='"validation"'
 
 if [[ $IS_PR != 'true' ]] || [[ $PERFORMANCE_ENABLED == 'true' ]]; then
-    build_types+=",'performance'"
-    hw_types+=",'performance'"
-    #wokwi_types+=",'performance'"
-    #qemu_types+=",'performance'"
+    build_types+=',"performance"'
+    hw_types+=',"performance"'
+    #wokwi_types+=',"performance"'
+    #qemu_types+=',"performance"'
 fi
 
-hw_targets="'esp32','esp32s2','esp32s3','esp32c3','esp32c5','esp32c6','esp32h2','esp32p4'"
-wokwi_targets="'esp32','esp32s2','esp32s3','esp32c3','esp32c6','esp32h2','esp32p4'"
-qemu_targets="'esp32','esp32c3'"
+hw_targets='"esp32","esp32s2","esp32s3","esp32c3","esp32c5","esp32c6","esp32h2","esp32p4"'
+wokwi_targets='"esp32","esp32s2","esp32s3","esp32c3","esp32c6","esp32h2","esp32p4"'
+qemu_targets='"esp32","esp32c3"'
 
 # The build targets should be the sum of the hw, wokwi and qemu targets without duplicates
-build_targets=$(echo "$hw_targets,$wokwi_targets,$qemu_targets" | tr ',' '\n' | sort -u | tr '\n' ',')
+build_targets=$(echo "$hw_targets,$wokwi_targets,$qemu_targets" | tr ',' '\n' | sort -u | tr '\n' ',' | sed 's/,$//')
 
 mkdir -p info
 

.gitlab/scripts/gen_hw_jobs.py

@@ -262,18 +262,20 @@ def list_project_runners() -> list[dict]:
             # Project-scoped listing might be restricted for JOB-TOKEN in some instances.
             # Return what we have (likely nothing) and let caller decide.
             if status == 403:
-                sys.stderr.write(f"\n[ERROR] 403 Forbidden when listing project runners\n")
+                sys.stderr.write("\n[ERROR] 403 Forbidden when listing project runners\n")
                 sys.stderr.write(f"  Project ID: {project_id}\n")
                 sys.stderr.write(f"  Authentication: {key if key else 'None'}\n")
-                sys.stderr.write(f"  Endpoint: projects/{project_id}/runners\n\n")
-                sys.stderr.write(f"Required permissions:\n")
-                sys.stderr.write(f"  - Token scope: 'api' (you likely have this)\n")
-                sys.stderr.write(f"  - Project role: Maintainer or Owner (you may be missing this)\n\n")
-                sys.stderr.write(f"Solutions:\n")
-                sys.stderr.write(f"  1. Ensure the token owner has Maintainer/Owner role on project {project_id}\n")
-                sys.stderr.write(f"  2. Use a Group Access Token if available (has higher privileges)\n")
-                sys.stderr.write(f"  3. Set environment variable: ASSUME_TAGGED_GROUPS_MISSING=0\n")
-                sys.stderr.write(f"     (This will skip runner enumeration and schedule all groups)\n\n")
+                sys.stderr.write("  Endpoint: projects/{project_id}/runners\n\n")
+
+                sys.stderr.write("Required permissions:\n")
+                sys.stderr.write("  - Token scope: 'api' (you likely have this)\n")
+                sys.stderr.write("  - Project role: Maintainer or Owner (you may be missing this)\n\n")
+
+                sys.stderr.write("Solutions:\n")
+                sys.stderr.write("  1. Ensure the token owner has Maintainer/Owner role on project {project_id}\n")
+                sys.stderr.write("  2. Use a Group Access Token if available (has higher privileges)\n")
+                sys.stderr.write("  3. Set environment variable: ASSUME_TAGGED_GROUPS_MISSING=0\n")
+                sys.stderr.write("     (This will skip runner enumeration and schedule all groups)\n\n")
             break
         runners.extend(x for x in obj if isinstance(x, dict))
         if len(obj) < per_page:
@@ -417,7 +419,7 @@ def main():
     # Track skipped groups for reporting
     skipped_groups: list[dict] = []
 
-    print(f"\n=== Test Group Scheduling ===")
+    print("\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
@@ -430,9 +432,9 @@ def main():
         print(f"    Required tags: {', '.join(tag_list)}")
         print(f"    Tests: {len(test_dirs)}")
         if can_schedule:
-            print(f"    ✓ Runner found - scheduling")
+            print("    ✓ Runner found - scheduling")
         else:
-            print(f"    ✗ NO RUNNER FOUND - skipping")
+            print("    ✗ NO RUNNER FOUND - skipping")
 
         if can_schedule:
             job_name = f"hw-{chip}-{test_type}-{tag_suffix}"[:255]
@@ -462,11 +464,11 @@ def main():
             )
 
     # Print summary
-    print(f"\n=== Summary ===")
+    print("\n=== Summary ===")
     print(f"  Scheduled groups: {len(jobs_entries)}")
     print(f"  Skipped groups (no runner): {len(skipped_groups)}")
     if skipped_groups:
-        print(f"\n  Skipped group details:")
+        print("\n  Skipped group details:")
         for sg in skipped_groups:
             chip = sg.get("chip")
             test_type = sg.get("test_type")