Skip to content
This repository was archived by the owner on Apr 18, 2024. It is now read-only.

Commit b630b06

Browse files
authored
Fix/cleanup pipeline (#263)
* Remove nrftc repo * Add S130 in tests * Make errors stop test pipeline * Update with nrftc argument change
1 parent 777b69d commit b630b06

1 file changed

Lines changed: 11 additions & 11 deletions

File tree

.azure-pipelines/azure-pipelines.yml

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,7 @@ jobs:
140140
# Windows
141141
- script: |
142142
pip3 install --use-deprecated legacy-resolver nrfutil
143-
$(System.ArtifactsDirectory)/nrftc install -a $(Agent.BuildDirectory)\toolchain -i armgcc:${{ parameters.ARMGCC_VERSION }} -e $(Agent.BuildDirectory)\tcenv.bat
143+
$(System.ArtifactsDirectory)/nrftc install arm-toolchain -a $(Agent.BuildDirectory)\toolchain -i armgcc:${{ parameters.ARMGCC_VERSION }} -e $(Agent.BuildDirectory)\tcenv.bat
144144
echo "Exported environment variables:"
145145
cat $(Agent.BuildDirectory)/tcenv.bat
146146
choco install ninja make
@@ -215,7 +215,7 @@ jobs:
215215
/usr/bin/python3 -m pip install -U pip
216216
/usr/bin/python3 -m pip install nrfutil
217217
chmod a+x $(System.ArtifactsDirectory)/nrftc
218-
$(System.ArtifactsDirectory)/nrftc install -a $(Agent.BuildDirectory)/toolchain -i armgcc:${{ parameters.ARMGCC_VERSION }} -e $(Agent.BuildDirectory)/tcenv.sh
218+
$(System.ArtifactsDirectory)/nrftc install arm-toolchain -a $(Agent.BuildDirectory)/toolchain -i armgcc:${{ parameters.ARMGCC_VERSION }} -e $(Agent.BuildDirectory)/tcenv.sh
219219
cat $(Agent.BuildDirectory)/tcenv.sh
220220
chmod a+x $(Agent.BuildDirectory)/tcenv.sh
221221
condition: contains(variables['imageName'], 'ubuntu')
@@ -257,7 +257,7 @@ jobs:
257257
export PYTHON_EXECUTABLE=`pyenv which python`
258258
$PYTHON_EXECUTABLE -m pip install nrfutil
259259
chmod a+x $(System.ArtifactsDirectory)/nrftc
260-
$(System.ArtifactsDirectory)/nrftc install -a $(Agent.BuildDirectory)/toolchain -i armgcc:${{ parameters.ARMGCC_VERSION }} -e $(Agent.BuildDirectory)/tcenv.sh
260+
$(System.ArtifactsDirectory)/nrftc install arm-toolchain -a $(Agent.BuildDirectory)/toolchain -i armgcc:${{ parameters.ARMGCC_VERSION }} -e $(Agent.BuildDirectory)/tcenv.sh
261261
cat $(Agent.BuildDirectory)/tcenv.sh
262262
chmod a+x $(Agent.BuildDirectory)/tcenv.sh
263263
condition: contains(variables['imageName'], 'mac')
@@ -327,8 +327,8 @@ jobs:
327327
mkdir %TEST_REPORT_DIR%
328328
set INSTALL_PATH=$(Pipeline.Workspace)\_e\$(EXTRACT_DIR)
329329
set PATH=c:\opt\nrf-device-lib-install\bin;%PATH%
330-
$(System.ArtifactsDirectory)/nrftc -vvv tests-nrf-ble-driver -i %INSTALL_PATH% -c ${{ parameters.ITERATIONS_TEST }} -d ${{ parameters.TEST_DRIVER_LOG_LEVEL }} -l ${{ parameters.TEST_LOG_LEVEL }} -o %TEST_REPORT_DIR% --exclude-softdevice-types ${{ parameters.TEST_EXCLUDE_SOFTDEVICE_TYPES }} --resume-on-test-failure
331-
continueOnError: true
330+
$(System.ArtifactsDirectory)/nrftc nrf-ble-driver run-tests -i %INSTALL_PATH% -c ${{ parameters.ITERATIONS_TEST }} -d ${{ parameters.TEST_DRIVER_LOG_LEVEL }} -l ${{ parameters.TEST_LOG_LEVEL }} -o %TEST_REPORT_DIR% --exclude-softdevice-types ${{ parameters.TEST_EXCLUDE_SOFTDEVICE_TYPES }} --resume-on-test-failure
331+
continueOnError: false
332332
failOnStderr: false
333333
timeoutInMinutes: ${{ parameters.TEST_TIMEOUT }}
334334
displayName: 'Run Windows(x86) tests'
@@ -373,8 +373,8 @@ jobs:
373373
mkdir %TEST_REPORT_DIR%
374374
set INSTALL_PATH=$(Pipeline.Workspace)\_e\$(EXTRACT_DIR)
375375
set PATH=c:\opt\nrf-device-lib-install\bin;%PATH%
376-
$(System.ArtifactsDirectory)/nrftc -vvv tests-nrf-ble-driver -i %INSTALL_PATH% -c ${{ parameters.ITERATIONS_TEST }} -d ${{ parameters.TEST_DRIVER_LOG_LEVEL }} -l ${{ parameters.TEST_LOG_LEVEL }} -o %TEST_REPORT_DIR% --exclude-softdevice-types ${{ parameters.TEST_EXCLUDE_SOFTDEVICE_TYPES }} --resume-on-test-failure
377-
continueOnError: true
376+
$(System.ArtifactsDirectory)/nrftc nrf-ble-driver run-tests -i %INSTALL_PATH% -c ${{ parameters.ITERATIONS_TEST }} -d ${{ parameters.TEST_DRIVER_LOG_LEVEL }} -l ${{ parameters.TEST_LOG_LEVEL }} -o %TEST_REPORT_DIR% --exclude-softdevice-types ${{ parameters.TEST_EXCLUDE_SOFTDEVICE_TYPES }} --resume-on-test-failure
377+
continueOnError: false
378378
failOnStderr: false
379379
timeoutInMinutes: ${{ parameters.TEST_TIMEOUT }}
380380
displayName: 'Run Windows(x64) tests'
@@ -425,8 +425,8 @@ jobs:
425425
export PATH=$NRF_DEVICE_LIB_INSTALL:$PATH
426426
427427
chmod a+x $(System.ArtifactsDirectory)/nrftc
428-
$(System.ArtifactsDirectory)/nrftc -vvv tests-nrf-ble-driver -i $INSTALL_DIR -c ${{ parameters.ITERATIONS_TEST }} -d ${{ parameters.TEST_DRIVER_LOG_LEVEL }} -l ${{ parameters.TEST_LOG_LEVEL }} -o $TEST_REPORT_DIR --exclude-softdevice-types ${{ parameters.TEST_EXCLUDE_SOFTDEVICE_TYPES }} --resume-on-test-failure
429-
continueOnError: true
428+
$(System.ArtifactsDirectory)/nrftc nrf-ble-driver run-tests -i $INSTALL_DIR -c ${{ parameters.ITERATIONS_TEST }} -d ${{ parameters.TEST_DRIVER_LOG_LEVEL }} -l ${{ parameters.TEST_LOG_LEVEL }} -o $TEST_REPORT_DIR --exclude-softdevice-types ${{ parameters.TEST_EXCLUDE_SOFTDEVICE_TYPES }} --resume-on-test-failure
429+
continueOnError: false
430430
failOnStderr: false
431431
timeoutInMinutes: ${{ parameters.TEST_TIMEOUT }}
432432
displayName: 'Run tests'
@@ -477,8 +477,8 @@ jobs:
477477
chmod a+x $INSTALL_DIR/bin/test*
478478
export LD_LIBRARY_PATH=$(Pipeline.Workspace)/lib:$NRF_DEVICE_LIB_INSTALL
479479
chmod a+x $(System.ArtifactsDirectory)/nrftc
480-
$(System.ArtifactsDirectory)/nrftc -vvv tests-nrf-ble-driver -i $INSTALL_DIR -c ${{ parameters.ITERATIONS_TEST }} -d ${{ parameters.TEST_DRIVER_LOG_LEVEL }} -l ${{ parameters.TEST_LOG_LEVEL }} -o $TEST_REPORT_DIR --exclude-softdevice-types ${{ parameters.TEST_EXCLUDE_SOFTDEVICE_TYPES }} --resume-on-test-failure
481-
continueOnError: true
480+
$(System.ArtifactsDirectory)/nrftc nrf-ble-driver run-tests -i $INSTALL_DIR -c ${{ parameters.ITERATIONS_TEST }} -d ${{ parameters.TEST_DRIVER_LOG_LEVEL }} -l ${{ parameters.TEST_LOG_LEVEL }} -o $TEST_REPORT_DIR --exclude-softdevice-types ${{ parameters.TEST_EXCLUDE_SOFTDEVICE_TYPES }} --resume-on-test-failure
481+
continueOnError: false
482482
failOnStderr: false
483483
timeoutInMinutes: ${{ parameters.TEST_TIMEOUT }}
484484
displayName: 'Run macOS(x64) tests'

0 commit comments

Comments
 (0)