From 5ab2635b0701a6c4d9ca2dcef68dba88a5c42e84 Mon Sep 17 00:00:00 2001 From: Alberto Escolar Piedras Date: Thu, 21 Mar 2024 15:36:55 +0100 Subject: [PATCH] ci: bsim tests: Use hwmv2 board names Refer to the nrf5340 bsim boards by their hwmv2 name. As a bonus remove a few variable settings which match the defaults from the scripts. Signed-off-by: Alberto Escolar Piedras --- .github/workflows/bsim-tests.yaml | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/.github/workflows/bsim-tests.yaml b/.github/workflows/bsim-tests.yaml index 97a84732980..9de3f36458c 100644 --- a/.github/workflows/bsim-tests.yaml +++ b/.github/workflows/bsim-tests.yaml @@ -154,22 +154,19 @@ jobs: if: steps.check-bluetooth-files.outputs.any_changed == 'true' || steps.check-common-files.outputs.any_changed == 'true' run: | export ZEPHYR_BASE=${PWD} - export WORK_DIR=${ZEPHYR_BASE}/bsim_bt # Build and run the BT tests for nrf52_bsim: nice tests/bsim/bluetooth/compile.sh RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_52_test_results_file} \ TESTS_FILE=tests/bsim/bluetooth/tests.nrf52bsim.txt tests/bsim/run_parallel.sh - # Build and run the BT controller tests also for the nrf5340bsim_nrf5340_cpunet - BOARD=nrf5340bsim_nrf5340_cpunet \ + # Build and run the BT controller tests also for the nrf5340bsim/nrf5340/cpunet nice tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpunet.sh - BOARD=nrf5340bsim_nrf5340_cpunet \ + BOARD=nrf5340bsim/nrf5340/cpunet \ RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_53_test_results_file} \ TESTS_FILE=tests/bsim/bluetooth/tests.nrf5340bsim_nrf5340_cpunet.txt \ tests/bsim/run_parallel.sh # Build and run the nrf5340 split stack tests set - BOARD=nrf5340bsim_nrf5340_cpuapp \ nice tests/bsim/bluetooth/compile.nrf5340bsim_nrf5340_cpuapp.sh - BOARD=nrf5340bsim_nrf5340_cpuapp \ + BOARD=nrf5340bsim/nrf5340/cpuapp \ RESULTS_FILE=${ZEPHYR_BASE}/${bsim_bt_53split_test_results_file} \ TESTS_FILE=tests/bsim/bluetooth/tests.nrf5340bsim_nrf5340_cpuapp.txt \ tests/bsim/run_parallel.sh