Merge branch 'ci/fixes'

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):

.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