tests: Matrix, fota, cleanup

WIP

Author: jorgenmk

.github/workflows/target-test.yml

@@ -16,6 +16,11 @@ on:
         type: string
         required: false
         default: tests
+      matrix:
+        description: Matrix config
+        type: string
+        required: true
+        default: '["nrf9151dk"]'
 
   workflow_dispatch:
     inputs:
@@ -36,17 +41,19 @@ on:
         type: string
         required: false
         default: tests
+      matrix:
+        description: Matrix config
+        type: string
+        required: false
+        default: '["nrf9151dk"]'
 
 jobs:
   target_test:
     # This will create multiple jobs, one for each target defined in the matrix
     strategy:
       fail-fast: false # Don't fail all jobs if one fails
       matrix:
-        include:
-          - device: nrf9151dk
-          - device: thingy91x
-
+        device: ${{ fromJSON(inputs.matrix) }}
     # Self-hosted runner is labeled according to the device it is linked with
     runs-on: cia-trd-${{ matrix.device }}
     environment: ${{ matrix.device }}

tests/on_target/tests/test_functional/test_fota.py

@@ -27,11 +27,6 @@
 
 APP_BUNDLEID = os.getenv("APP_BUNDLEID")
 
-TEST_APP_BIN = {
-    "thingy91x": "artifacts/stable_version_jan_2025-update-signed.bin",
-    "nrf9151dk": "artifacts/nrf9151dk_mar_2025_update_signed.bin"
-}
-
 DEVICE_MSG_TIMEOUT = 60 * 5
 APP_FOTA_TIMEOUT = 60 * 10
 FULL_MFW_FOTA_TIMEOUT = 60 * 30
@@ -113,9 +108,15 @@ def run_fota_reschedule(dut_fota, fota_type):
     else:
         raise AssertionError(f"Fota update not available after {i} attempts")
 
-@pytest.fixture
-def run_fota_fixture(dut_fota, hex_file, reschedule=False):
-    def _run_fota(bundle_id="", fota_type="app", fotatimeout=APP_FOTA_TIMEOUT, new_version=TEST_APP_VERSION, reschedule=False):
+def run_fota(
+    dut_fota,
+    hex_file,
+    bundle_id,
+    reschedule=False,
+    fota_type="app",
+    fotatimeout=APP_FOTA_TIMEOUT,
+    new_version=TEST_APP_VERSION,
+    ):
         flash_device(os.path.abspath(hex_file))
         dut_fota.uart.xfactoryreset()
         dut_fota.uart.flush()
@@ -177,23 +178,24 @@ def _run_fota(bundle_id="", fota_type="app", fotatimeout=APP_FOTA_TIMEOUT, new_v
             logger.error(f"Version is not {new_version} after {DEVICE_MSG_TIMEOUT}s")
             raise e
 
-    return _run_fota
-
-
-def test_app_fota(run_fota_fixture):
+def test_app_fota(dut_fota, hex_file):
     '''
     Test application FOTA from nightly version to stable version
     '''
-    run_fota_fixture(
+    run_fota(
+        dut_fota,
+        hex_file,
         bundle_id=APP_BUNDLEID,
     )
 
-def test_delta_mfw_fota(run_fota_fixture):
+def test_delta_mfw_fota(dut_fota, hex_file):
     '''
     Test delta modem FOTA on nrf9151
     '''
     try:
-        run_fota_fixture(
+        run_fota(
+            dut_fota,
+            hex_file,
             bundle_id=DELTA_MFW_BUNDLEID,
             fota_type="delta",
             new_version=NEW_MFW_DELTA_VERSION
@@ -203,13 +205,14 @@ def test_delta_mfw_fota(run_fota_fixture):
         flash_device(os.path.abspath(MFW_202_FILEPATH))
 
 @pytest.mark.slow
-def test_full_mfw_fota(run_fota_fixture):
+def test_full_mfw_fota(dut_fota, hex_file):
     '''
     Test full modem FOTA on nrf9151
     '''
-
     try:
-        run_fota_fixture(
+        run_fota(
+            dut_fota,
+            hex_file,
             bundle_id=FULL_MFW_BUNDLEID,
             fota_type="full",
             new_version=MFW_202_VERSION,

tests/on_target/utils/flash_tools.py

@@ -17,7 +17,7 @@
 def reset_device(serial=SEGGER, reset_kind="RESET_SYSTEM"):
     logger.info(f"Resetting device, segger: {serial}")
     try:
-        result = subprocess.run(
+        subprocess.run(
             ['nrfutil', 'device', 'reset', '--serial-number', serial, '--reset-kind', reset_kind],
             check=True,
             text=True,
@@ -37,7 +37,7 @@ def flash_device(hexfile, serial=SEGGER, extra_args=[]):
         raise ValueError("hexfile cannot be None")
     logger.info(f"Flashing device, segger: {serial}, firmware: {hexfile}")
     try:
-        result = subprocess.run(['nrfutil', 'device', 'program', *extra_args, '--firmware', hexfile, '--serial-number', serial], check=True, text=True, capture_output=True)
+        subprocess.run(['nrfutil', 'device', 'program', *extra_args, '--firmware', hexfile, '--serial-number', serial], check=True, text=True, capture_output=True)
         logger.info("Command completed successfully.")
     except subprocess.CalledProcessError as e:
         # Handle errors in the command execution