tests: Add nrf9151dk

Signed-off-by: Jorgen Kvalvaag <jorgen.kvalvaag@nordicsemi.no>

Author: jorgenmk

.github/workflows/build.yml

@@ -93,19 +93,28 @@ jobs:
           fi
 
       # Asset Tracker Template firmware build
+      - name: Build thingy91x firmware
+        working-directory: asset-tracker-template/app
+        run: |
+          cp overlay-memfault.conf overlay-memfault-att.conf
+          echo "CONFIG_MEMFAULT_NCS_PROJECT_KEY=\"${{ secrets.MEMFAULT_PROJECT_KEY }}\"" >> overlay-memfault-att.conf
+          echo CONFIG_MEMFAULT_NCS_FW_VERSION_STATIC=y >> overlay-memfault-att.conf
+          echo CONFIG_MEMFAULT_NCS_FW_VERSION=\"${{ env.VERSION }}\" >> overlay-memfault-att.conf
+          echo CONFIG_MEMFAULT_NCS_FW_TYPE=\"${{ env.MEMFAULT_SW_TYPE }}\" >> overlay-memfault-att.conf
+          west build -b thingy91x/nrf9151/ns -d build_thingy91x -p --sysbuild -- -DEXTRA_CONF_FILE="overlay-memfault-att.conf"
 
-      - name: Build nrf91 firmware
+      - name: Build nrf9151dk firmware
         working-directory: asset-tracker-template/app
         run: |
           cp overlay-memfault.conf overlay-memfault-att.conf
           echo "CONFIG_MEMFAULT_NCS_PROJECT_KEY=\"${{ secrets.MEMFAULT_PROJECT_KEY }}\"" >> overlay-memfault-att.conf
           echo CONFIG_MEMFAULT_NCS_FW_VERSION_STATIC=y >> overlay-memfault-att.conf
           echo CONFIG_MEMFAULT_NCS_FW_VERSION=\"${{ env.VERSION }}\" >> overlay-memfault-att.conf
           echo CONFIG_MEMFAULT_NCS_FW_TYPE=\"${{ env.MEMFAULT_SW_TYPE }}\" >> overlay-memfault-att.conf
-          west build -b thingy91x/nrf9151/ns -p --sysbuild -- -DEXTRA_CONF_FILE="overlay-memfault-att.conf"
+          west build -b nrf9151dk/nrf9151/ns -d build_nrf9151dk -p --sysbuild -- -DEXTRA_CONF_FILE="overlay-memfault-att.conf"
 
-      - name: Rename artifacts
-        working-directory: asset-tracker-template/app/build
+      - name: Rename artifacts thingy91x
+        working-directory: asset-tracker-template/app/build_thingy91x
         run: |
           cp merged.hex asset-tracker-template-${{ env.VERSION }}-thingy91x-nrf91.hex
           cp app/zephyr/.config asset-tracker-template-${{ env.VERSION }}-thingy91x-nrf91.config
@@ -114,8 +123,18 @@ jobs:
           cp app/zephyr/zephyr.elf asset-tracker-template-${{ env.VERSION }}-thingy91x-nrf91.elf
           cp dfu_application.zip asset-tracker-template-${{ env.VERSION }}-thingy91x-nrf91-dfu.zip
 
-      - name: Create partition manager report for nRF91 firmware
-        working-directory: asset-tracker-template/app/build
+      - name: Rename artifacts dk
+        working-directory: asset-tracker-template/app/build_nrf9151dk
+        run: |
+          cp merged.hex asset-tracker-template-${{ env.VERSION }}-nrf9151dk-nrf91.hex
+          cp app/zephyr/.config asset-tracker-template-${{ env.VERSION }}-nrf9151dk-nrf91.config
+          cp app/zephyr/zephyr.signed.bin asset-tracker-template-${{ env.VERSION }}-nrf9151dk-nrf91-update-signed.bin
+          cp app/zephyr/zephyr.signed.hex asset-tracker-template-${{ env.VERSION }}-nrf9151dk-nrf91-update-signed.hex
+          cp app/zephyr/zephyr.elf asset-tracker-template-${{ env.VERSION }}-nrf9151dk-nrf91.elf
+          cp dfu_application.zip asset-tracker-template-${{ env.VERSION }}-nrf9151dk-nrf91-dfu.zip
+
+      - name: Create partition manager report for thingy91x firmware
+        working-directory: asset-tracker-template/app/build_thingy91x
         run: |
           ninja partition_manager_report
           ninja partition_manager_report > pmr-nrf91-default-${{ env.VERSION }}.txt
@@ -128,11 +147,12 @@ jobs:
           name: firmware-att
           if-no-files-found: error
           path: |
-            asset-tracker-template/app/build/asset-tracker-template-*.*
+            asset-tracker-template/app/build_thingy91x/asset-tracker-template-*.*
+            asset-tracker-template/app/build_nrf9151dk/asset-tracker-template-*.*
 
       # Asset Tracker Template debug firmware build
 
-      - name: Build nrf91 debug firmware
+      - name: Build thingy91x debug firmware
         if: ${{ inputs.build_debug }}
         working-directory: asset-tracker-template/app
         run: |

.github/workflows/target-test.yml

@@ -41,15 +41,17 @@ 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
+      fail-fast: false # Don't fail all jobs if one fails
       matrix:
         include:
-          - device: cia-trd-thingy91x
+          - device: nrf9151dk
+          - device: thingy91x
           - device: ppk_thingy91x
             if: ${{ inputs.pytest_marker == '' || inputs.pytest_marker == 'no_markers_flag' || inputs.pytest_marker == 'slow' }}
 
     # Self-hosted runner is labeled according to the device it is linked with
-    runs-on: ${{ matrix.device }}
+    runs-on: cia-trd-${{ matrix.device }}
+    environment: ${{ matrix.device }}
     name: Target Test - ${{ matrix.device }}
 
     permissions:
@@ -105,10 +107,11 @@ jobs:
               upload-mcu-symbols \
               --software-type asset-tracker-template-ci \
               --software-version ${{ inputs.artifact_fw_version }} \
-              asset-tracker-template-${{ inputs.artifact_fw_version }}-thingy91x-nrf91.elf
+              build_${{ matrix.device }}/asset-tracker-template-${{ inputs.artifact_fw_version }}-${{ matrix.device }}-nrf91.elf
 
       - name: Target Tests
         working-directory: asset-tracker-template/tests/on_target
+        environment: new-team-board
         run: |
           mkdir -p results
 
@@ -135,6 +138,7 @@ jobs:
         shell: bash
         env:
           SEGGER: ${{ env.RUNNER_SERIAL_NUMBER }}
+          DUT_DEVICE_TYPE: ${{ matrix.device }}
           UUID: ${{ env.UUID }}
           NRFCLOUD_API_KEY: ${{ secrets.NRF_CLOUD_API_KEY }}
           LOG_FILENAME: att_test_log

tests/on_target/tests/conftest.py

@@ -22,6 +22,7 @@
 UART_ID = os.getenv('UART_ID', SEGGER)
 FOTADEVICE_UUID = os.getenv('UUID')
 NRFCLOUD_API_KEY = os.getenv('NRFCLOUD_API_KEY')
+DUT_DEVICE_TYPE = os.getenv('DUT_DEVICE_TYPE')
 
 def get_uarts():
     base_path = "/dev/serial/by-id"
@@ -54,7 +55,7 @@ def pytest_runtest_logfinish(nodeid, location):
     logger.info(f"Finished test: {nodeid}")
 
 @pytest.fixture(scope="function")
-def t91x_board():
+def dut_board():
     all_uarts = get_uarts()
     if not all_uarts:
         pytest.fail("No UARTs found")
@@ -70,7 +71,7 @@ def t91x_board():
     scan_log_for_assertions(uart_log)
 
 @pytest.fixture(scope="function")
-def t91x_fota(t91x_board):
+def dut_fota(dut_board):
     if not NRFCLOUD_API_KEY:
         pytest.skip("NRFCLOUD_API_KEY environment variable not set")
     if not FOTADEVICE_UUID:
@@ -86,7 +87,7 @@ def t91x_fota(t91x_board):
 
     yield types.SimpleNamespace(
         fota=fota,
-        uart=t91x_board.uart,
+        uart=dut_board.uart,
         device_id=device_id,
         data=data
     )
@@ -97,23 +98,23 @@ def t91x_fota(t91x_board):
 
 
 @pytest.fixture(scope="module")
-def t91x_traces(t91x_board):
+def dut_traces(dut_board):
     all_uarts = get_uarts()
     trace_uart_string = all_uarts[1]
     uart_trace = UartBinary(trace_uart_string)
 
     yield types.SimpleNamespace(
         trace=uart_trace,
-        uart=t91x_board.uart
+        uart=dut_board.uart
         )
 
     uart_trace.stop()
 
 @pytest.fixture(scope="session")
 def hex_file():
     # Search for the firmware hex file in the artifacts folder
-    artifacts_dir = "artifacts"
-    hex_pattern = r"asset-tracker-template-[0-9a-z\.]+-thingy91x-nrf91\.hex"
+    artifacts_dir = f"artifacts/build_{DUT_DEVICE_TYPE}"
+    hex_pattern = f"asset-tracker-template-{r"[0-9a-z\.]+"}-{DUT_DEVICE_TYPE}-nrf91.hex"
 
     for file in os.listdir(artifacts_dir):
         if re.match(hex_pattern, file):
@@ -124,8 +125,8 @@ def hex_file():
 @pytest.fixture(scope="session")
 def bin_file():
     # Search for the firmware bin file in the artifacts folder
-    artifacts_dir = "artifacts"
-    hex_pattern = r"asset-tracker-template-[0-9a-z\.]+-thingy91x-nrf91-update-signed\.bin"
+    artifacts_dir = f"artifacts/build_{DUT_DEVICE_TYPE}"
+    hex_pattern = f"asset-tracker-template-{r"[0-9a-z\.]+"}-{DUT_DEVICE_TYPE}-nrf91-update-signed.hex"
 
     for file in os.listdir(artifacts_dir):
         if re.match(hex_pattern, file):

tests/on_target/tests/test_functional/test_fota.py

@@ -46,81 +46,80 @@ def await_nrfcloud(func, expected, field, timeout):
         if expected in data:
             break
 
-def get_appversion(t91x_fota):
-    shadow = t91x_fota.fota.get_device(t91x_fota.device_id)
+def get_appversion(dut_fota):
+    shadow = dut_fota.fota.get_device(dut_fota.device_id)
     return shadow["state"]["reported"]["device"]["deviceInfo"]["appVersion"]
 
-def get_modemversion(t91x_fota):
-    shadow = t91x_fota.fota.get_device(t91x_fota.device_id)
+def get_modemversion(dut_fota):
+    shadow = dut_fota.fota.get_device(dut_fota.device_id)
     return shadow["state"]["reported"]["device"]["deviceInfo"]["modemFirmware"]
 
-def run_fota_resumption(t91x_fota, fota_type):
+def run_fota_resumption(dut_fota, fota_type):
     timeout_50_percent= APP_FOTA_TIMEOUT/2
-    t91x_fota.uart.wait_for_str("50%", timeout=timeout_50_percent)
+    dut_fota.uart.wait_for_str("50%", timeout=timeout_50_percent)
     logger.debug(f"Testing fota resumption on disconnect for {fota_type} fota")
 
     patterns_lte_offline = ["network: Network connectivity lost"]
     patterns_lte_normal = ["network: Network connectivity established"]
 
     # LTE disconnect
-    t91x_fota.uart.flush()
-    t91x_fota.uart.write("zbus disconnect\r\n")
-    t91x_fota.uart.wait_for_str(patterns_lte_offline, timeout=20)
+    dut_fota.uart.flush()
+    dut_fota.uart.write("zbus disconnect\r\n")
+    dut_fota.uart.wait_for_str(patterns_lte_offline, timeout=20)
 
     # LTE reconnect
-    t91x_fota.uart.flush()
-    t91x_fota.uart.write("zbus connect\r\n")
-    t91x_fota.uart.wait_for_str(patterns_lte_normal, timeout=120)
-
-    t91x_fota.uart.wait_for_str("fota_download: Refuse fragment, restart with offset")
-    t91x_fota.uart.wait_for_str("fota_download: Downloading from offset:")
-
-def run_fota_reschedule(t91x_fota, fota_type):
-    t91x_fota.uart.wait_for_str(f"5%", timeout=APP_FOTA_TIMEOUT)
+    dut_fota.uart.flush()
+    dut_fota.uart.write("zbus connect\r\n")
+    dut_fota.uart.wait_for_str(patterns_lte_normal, timeout=120)
+    dut_fota.uart.wait_for_str("fota_download: Refuse fragment, restart with offset")
+    dut_fota.uart.wait_for_str("fota_download: Downloading from offset:")
+
+def run_fota_reschedule(dut_fota, fota_type):
+    dut_fota.uart.wait_for_str(f"5%", timeout=APP_FOTA_TIMEOUT)
     logger.debug(f"Cancelling FOTA, type: {fota_type}")
 
-    t91x_fota.fota.cancel_fota_job(t91x_fota.data['job_id'])
+    dut_fota.fota.cancel_fota_job(dut_fota.data['job_id'])
 
     await_nrfcloud(
-        functools.partial(t91x_fota.fota.get_fota_status, t91x_fota.data['job_id']),
+        functools.partial(dut_fota.fota.get_fota_status, dut_fota.data['job_id']),
         "CANCELLED",
         "FOTA status",
         APP_FOTA_TIMEOUT
     )
 
     patterns_fota_cancel = ["Firmware download canceled", "state_waiting_for_poll_request_entry"]
 
-    t91x_fota.uart.wait_for_str(patterns_fota_cancel, timeout=180)
+    dut_fota.uart.wait_for_str(patterns_fota_cancel, timeout=180)
 
-    t91x_fota.data['job_id'] = t91x_fota.fota.create_fota_job(t91x_fota.device_id, t91x_fota.data['bundle_id'])
+    dut_fota.data['job_id'] = dut_fota.fota.create_fota_job(dut_fota.device_id, dut_fota.data['bundle_id'])
 
-    logger.info(f"Rescheduled FOTA Job (ID: {t91x_fota.data['job_id']})")
+    logger.info(f"Rescheduled FOTA Job (ID: {dut_fota.data['job_id']})")
 
     # Sleep a bit and trigger fota poll
     for i in range(3):
         try:
             time.sleep(30)
-            t91x_fota.uart.write("zbus button_press\r\n")
-            t91x_fota.uart.wait_for_str("nrf_cloud_fota_poll: Starting FOTA download")
+            dut_fota.uart.write("zbus button_press\r\n")
+            dut_fota.uart.wait_for_str("nrf_cloud_fota_poll: Starting FOTA download")
             break
         except AssertionError:
             continue
     else:
         raise AssertionError(f"Fota update not available after {i} attempts")
 
 @pytest.fixture
-def run_fota_fixture(t91x_fota, hex_file, reschedule=False):
+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):
         flash_device(os.path.abspath(hex_file))
-        t91x_fota.uart.xfactoryreset()
-        t91x_fota.uart.flush()
+        dut_fota.uart.xfactoryreset()
+        dut_fota.uart.flush()
         reset_device()
-        t91x_fota.uart.wait_for_str("Connected to Cloud")
+        dut_fota.uart.wait_for_str("Connected to Cloud")
 
         time.sleep(60)
 
         if fota_type == "app":
-            bundle_id = t91x_fota.fota.upload_firmware(
+            bundle_id = dut_fota.fota.upload_firmware(
                 "nightly_test_app",
                 TEST_APP_BIN,
                 TEST_APP_VERSION,
@@ -130,39 +129,37 @@ def _run_fota(bundle_id="", fota_type="app", fotatimeout=APP_FOTA_TIMEOUT, new_v
             logger.info(f"Uploaded file {TEST_APP_BIN}: bundleId: {bundle_id}")
 
         try:
-            t91x_fota.data['job_id'] = t91x_fota.fota.create_fota_job(t91x_fota.device_id, bundle_id)
-            t91x_fota.data['bundle_id'] = bundle_id
+            dut_fota.data['job_id'] = dut_fota.fota.create_fota_job(dut_fota.device_id, bundle_id)
+            dut_fota.data['bundle_id'] = bundle_id
         except NRFCloudFOTAError as e:
             pytest.skip(f"FOTA create_job REST API error: {e}")
-        logger.info(f"Created FOTA Job (ID: {t91x_fota.data['job_id']})")
+        logger.info(f"Created FOTA Job (ID: {dut_fota.data['job_id']})")
 
         # Sleep a bit and trigger fota poll
         for i in range(3):
             try:
                 time.sleep(10)
-                t91x_fota.uart.write("zbus button_press\r\n")
-                t91x_fota.uart.wait_for_str("nrf_cloud_fota_poll: Starting FOTA download")
+                dut_fota.uart.write("zbus button_press\r\n")
+                dut_fota.uart.wait_for_str("nrf_cloud_fota_poll: Starting FOTA download")
                 break
             except AssertionError:
                 continue
         else:
             raise AssertionError(f"Fota update not available after {i} attempts")
 
         if reschedule:
-            run_fota_reschedule(t91x_fota, fota_type)
+            run_fota_reschedule(dut_fota, fota_type)
 
         if fota_type == "app":
-            run_fota_resumption(t91x_fota, "app")
-
+            run_fota_resumption(dut_fota, "app")
         await_nrfcloud(
-                functools.partial(t91x_fota.fota.get_fota_status, t91x_fota.data['job_id']),
+                functools.partial(dut_fota.fota.get_fota_status, dut_fota.data['job_id']),
                 "IN_PROGRESS",
                 "FOTA status",
                 fotatimeout
             )
-
         await_nrfcloud(
-                functools.partial(t91x_fota.fota.get_fota_status, t91x_fota.data['job_id']),
+                functools.partial(dut_fota.fota.get_fota_status, dut_fota.data['job_id']),
                 "COMPLETED",
                 "FOTA status",
                 fotatimeout
@@ -171,14 +168,14 @@ def _run_fota(bundle_id="", fota_type="app", fotatimeout=APP_FOTA_TIMEOUT, new_v
         try:
             if fota_type == "app":
                 await_nrfcloud(
-                    functools.partial(get_appversion, t91x_fota),
+                    functools.partial(get_appversion, dut_fota),
                     new_version,
                     "appVersion",
                     DEVICE_MSG_TIMEOUT
                 )
             else:
                 await_nrfcloud(
-                    functools.partial(get_modemversion, t91x_fota),
+                    functools.partial(get_modemversion, dut_fota),
                     new_version,
                     "modemFirmware",
                     DEVICE_MSG_TIMEOUT

tests/on_target/tests/test_functional/test_memfault.py

@@ -44,7 +44,7 @@ def timestamp(event):
     )
 
 
-def test_memfault(t91x_board, hex_file):
+def test_memfault(dut_board, hex_file):
     # Save timestamp of latest coredump
     coredumps = get_latest_coredump_traces(IMEI)
     logger.debug(f"Found coredumps: {coredumps}")
@@ -53,15 +53,15 @@ def test_memfault(t91x_board, hex_file):
 
 
     flash_device(os.path.abspath(hex_file))
-    t91x_board.uart.xfactoryreset()
-    t91x_board.uart.flush()
+    dut_board.uart.xfactoryreset()
+    dut_board.uart.flush()
     reset_device()
-    t91x_board.uart.wait_for_str("Connected to Cloud", timeout=120)
+    dut_board.uart.wait_for_str("Connected to Cloud", timeout=120)
 
     time.sleep(10)
 
     # Trigger usage fault to generate coredump
-    t91x_board.uart.write("mflt test usagefault\r\n")
+    dut_board.uart.write("mflt test usagefault\r\n")
 
     # Wait for upload to be reported to memfault api
     start = time.time()
@@ -80,5 +80,4 @@ def test_memfault(t91x_board, hex_file):
             if timestamp(coredumps[0]) > timestamp_old_coredump:
                 break
     else:
-        raise RuntimeError(f"No new coredump observed")
-
+        raise RuntimeError("No new coredump observed")