Move J-Link serial number to command line arguments

Add ZSWatch HW revision as variable

.github/workflows/test.yml

@@ -2,13 +2,19 @@ on: [workflow_call]
 
 jobs:
   test:
-    runs-on: self-hosted
+    runs-on: ${{ matrix.runner }}
     container: 
       image: ghcr.io/zephyrproject-rtos/zephyr-build:v0.26.2
       volumes:
         - /dev/bus/usb/:/dev/bus/usb
       options: --privileged
 
+    strategy:
+      matrix:
+        hardware_revisions: [5]
+        jlink_devices: [760208506]
+        runner: [ZSWatch]
+
     steps:
       - uses: actions/checkout@v4
 
@@ -37,15 +43,15 @@ jobs:
           python -m pip install --upgrade pip
           pip install -r app/pytest/requirements.txt
 
-      - name: 'Download image'
+      - name: Download debug image
         uses: actions/download-artifact@v4
         with:
-          name: zswatch_nrf5340_cpuapp@3_debug
+          name: zswatch_nrf5340_cpuapp@${{ matrix.hardware_revisions }}_debug
 
       - name: Display structure of downloaded files
         run: ls
 
       - name: Test with pytest
         run: |
           pip install pytest
-          pytest app/pytest/
+          pytest --jlink=${{ matrix.jlink_devices }} --hw=${{ matrix.hardware_revisions }} app/pytest/

app/pytest/conftest.py

@@ -1,15 +1,33 @@
 import pytest
 import utils
 import logging
+import pytest
 
 logging.basicConfig(level=logging.INFO)
 
+def pytest_addoption(parser):
+    parser.addoption("--jlink", action="store", help="Serial number of target J-Link")
+    parser.addoption("--hw", action="store", help="ZSWatch hardware revision")
+
+def pytest_configure(config):
+    jlink = config.getoption("--jlink")
+    hw = config.getoption("--hw")
 
-def pytest_configure():
-    utils.flash()
+    log = logging.getLogger()
+    log.info("Using J-Link {}".format(jlink))
+    log.info("Using ZSWatch revision {}".format(hw))
 
+    utils.flash(jlink=jlink, hw=hw)
 
 @pytest.fixture(autouse=True)
-def reset():
-    utils.reset()
+def reset(jlink):
+    utils.reset(jlink=jlink)
     yield
+
+@pytest.fixture
+def jlink(request):
+    return request.config.getoption("--jlink")
+
+@pytest.fixture
+def hw(request):
+    return request.config.getoption("--hw")

app/pytest/requirements.txt

@@ -18,8 +18,5 @@ psutil
 # Artifacts package creation
 bz
 
-# used for CAN <=> host testing
-python-can>=4.3.0
-
 # RTT connection
-pylink-square
+pylink-square

app/pytest/test_basic.py

@@ -1,18 +1,17 @@
-import time
 import logging
 import utils
 
 log = logging.getLogger()
 
 
-def test_flash():
+def test_flash(jlink, hw):
     """Test flashing, don't need to assert as failing to flash throws exception"""
-    utils.flash()
+    utils.flash(jlink=jlink, hw=hw)
 
 
-def test_reset():
+def test_reset(jlink):
     """Test Reset, don't need to assert as failing to reset throws exception"""
-    utils.reset()
+    utils.reset(jlink=jlink)
 
 
 def test_boot():

app/pytest/utils.py

@@ -1,10 +1,9 @@
+import os
 import subprocess
 import logging
 import time
 import pylink
 
-SERIAL_NUMBER = "760208490"
-
 log = logging.getLogger()
 
 
@@ -13,7 +12,7 @@ def current_milli_time():
     return round(time.time() * 1000)
 
 
-def reset():
+def reset(jlink):
     """Reset DUT"""
     log.info("Reset DUT")
     subprocess.run(
@@ -22,7 +21,7 @@ def reset():
             "--family",
             "nrf53",
             "--snr",
-            SERIAL_NUMBER,
+            jlink,
             "--reset",
         ],
         shell=False,
@@ -32,7 +31,7 @@ def reset():
     )
 
 
-def flash():
+def flash(jlink, hw):
     """Flash firmware"""
     log.info("Flashing CP_APPLICATION.")
     subprocess.run(
@@ -41,9 +40,9 @@ def flash():
             "--family",
             "nrf53",
             "--snr",
-            SERIAL_NUMBER,
+            jlink,
             "--program",
-            "./zswatch_nrf5340_cpuapp@3_debug.hex",
+            "./zswatch_nrf5340_cpuapp@{}_debug.hex".format(hw),
             "--chiperase",
             "--verify",
         ],
@@ -60,7 +59,7 @@ def flash():
             "--family",
             "nrf53",
             "--snr",
-            SERIAL_NUMBER,
+            jlink,
             "--program",
             "./zswatch_nrf5340_CPUNET.hex",
             "--coprocessor",
@@ -76,12 +75,12 @@ def flash():
     )
 
 
-def read_rtt(target_device="nRF5340_XXAA", timeout_ms=10000):
+def read_rtt(jlink, target_device="nRF5340_XXAA", timeout_ms=10000):
     """Read Segger RTT output"""
     jlink = pylink.JLink()
     logging.getLogger("pylink.jlink").setLevel(logging.WARNING)
     log.info("Connecting to JLink...")
-    jlink.open(serial_no=SERIAL_NUMBER)
+    jlink.open(serial_no=jlink)
     log.info("Connecting to %s..." % target_device)
     jlink.set_tif(pylink.enums.JLinkInterfaces.SWD)
     jlink.connect(target_device)