aboutsummaryrefslogtreecommitdiffstats
path: root/.ci/templates
diff options
context:
space:
mode:
Diffstat (limited to '.ci/templates')
-rw-r--r--.ci/templates/job-uhd-devtest-rhombus.yml90
-rw-r--r--.ci/templates/job-uhd-devtest.yml17
2 files changed, 26 insertions, 81 deletions
diff --git a/.ci/templates/job-uhd-devtest-rhombus.yml b/.ci/templates/job-uhd-devtest-rhombus.yml
index a05f47644..8e4c3ba9e 100644
--- a/.ci/templates/job-uhd-devtest-rhombus.yml
+++ b/.ci/templates/job-uhd-devtest-rhombus.yml
@@ -20,135 +20,69 @@ jobs:
uhdArtifactSource: '${{ parameters.uhdArtifactSource }}'
redisHost: 'sdr-rhombus'
dutMatrix:
- rhombus-x300-UBX-0 XG:
+ rhombus-x300-UBX-0:
devType: 'x300'
devModel: 'x300'
devName: 'rhombus-x300-UBX-0'
devSerial: '30A6019'
devBus: 'ip'
devAddr: '192.168.40.2'
- devFpga: 'XG'
+ devFpga: 'HG,XG'
devtestPattern: 'x3x0'
jtagSerial: '2516350A6019'
jtagServer: 'nitest@sdr-rhombus'
- rhombus-x310-UBX-0 XG:
+ rhombus-x310-UBX-0:
devType: 'x300'
devModel: 'x310'
devName: 'rhombus-x310-UBX-0'
devSerial: '3138EF5'
devBus: 'ip'
devAddr: '192.168.40.3'
- devFpga: 'XG'
+ devFpga: 'HG,XG'
devtestPattern: 'x3x0'
jtagSerial: '251635138E98'
jtagServer: 'nitest@sdr-rhombus'
- rhombus-x310-CBX-0 XG:
+ rhombus-x310-CBX-0:
devType: 'x300'
devModel: 'x310'
devName: 'rhombus-x310-CBX-0'
devSerial: '30796C2'
devBus: 'ip'
devAddr: '192.168.40.4'
- devFpga: 'XG'
+ devFpga: 'HG,XG'
devtestPattern: 'x3x0'
jtagSerial: '2516350796C2'
jtagServer: 'nitest@sdr-rhombus'
- rhombus-x310-WBX-0 XG:
+ rhombus-x310-WBX-0:
devType: 'x300'
devModel: 'x310'
devName: 'rhombus-x310-WBX-0'
devSerial: '30C5BFF'
devBus: 'ip'
devAddr: '192.168.40.5'
- devFpga: 'XG'
+ devFpga: 'HG,XG'
devtestPattern: 'x3x0'
jtagSerial: '2516350C5BFF'
jtagServer: 'nitest@sdr-rhombus'
- rhombus-x310-TWINRX-0 XG:
+ rhombus-x310-TWINRX-0:
devType: 'x300'
devModel: 'x310'
devName: rhombus-x310-TWINRX-0
devSerial: 'F43D13'
devBus: 'ip'
devAddr: '192.168.40.6'
- devFpga: 'XG'
+ devFpga: 'HG,XG'
devtestPattern: 'x3x0'
jtagSerial: '251635F43D13'
jtagServer: 'nitest@sdr-rhombus'
- rhombus-x300-SBX-0 XG:
+ rhombus-x300-SBX-0:
devType: 'x300'
devModel: 'x300'
devName: rhombus-x300-SBX-0
devSerial: '32244AD'
devBus: 'ip'
devAddr: '192.168.40.7'
- devFpga: 'XG'
- devtestPattern: 'x3x0'
- jtagSerial: '2516352244AD'
- jtagServer: 'nitest@sdr-rhombus'
- rhombus-x300-UBX-0 HG:
- devType: 'x300'
- devModel: 'x300'
- devName: 'rhombus-x300-UBX-0'
- devSerial: '30A6019'
- devBus: 'ip'
- devAddr: '192.168.40.2'
- devFpga: 'HG'
- devtestPattern: 'x3x0'
- jtagSerial: '2516350A6019'
- jtagServer: 'nitest@sdr-rhombus'
- rhombus-x310-UBX-0 HG:
- devType: 'x300'
- devModel: 'x310'
- devName: 'rhombus-x310-UBX-0'
- devSerial: '3138EF5'
- devBus: 'ip'
- devAddr: '192.168.40.3'
- devFpga: 'HG'
- devtestPattern: 'x3x0'
- jtagSerial: '251635138E98'
- jtagServer: 'nitest@sdr-rhombus'
- rhombus-x310-CBX-0 HG:
- devType: 'x300'
- devModel: 'x310'
- devName: 'rhombus-x310-CBX-0'
- devSerial: '30796C2'
- devBus: 'ip'
- devAddr: '192.168.40.4'
- devFpga: 'HG'
- devtestPattern: 'x3x0'
- jtagSerial: '2516350796C2'
- jtagServer: 'nitest@sdr-rhombus'
- rhombus-x310-WBX-0 HG:
- devType: 'x300'
- devModel: 'x310'
- devName: 'rhombus-x310-WBX-0'
- devSerial: '30C5BFF'
- devBus: 'ip'
- devAddr: '192.168.40.5'
- devFpga: 'HG'
- devtestPattern: 'x3x0'
- jtagSerial: '2516350C5BFF'
- jtagServer: 'nitest@sdr-rhombus'
- rhombus-x310-TWINRX-0 HG:
- devType: 'x300'
- devModel: 'x310'
- devName: rhombus-x310-TWINRX-0
- devSerial: 'F43D13'
- devBus: 'ip'
- devAddr: '192.168.40.6'
- devFpga: 'HG'
- devtestPattern: 'x3x0'
- jtagSerial: '251635F43D13'
- jtagServer: 'nitest@sdr-rhombus'
- rhombus-x300-SBX-0 HG:
- devType: 'x300'
- devModel: 'x300'
- devName: rhombus-x300-SBX-0
- devSerial: '32244AD'
- devBus: 'ip'
- devAddr: '192.168.40.7'
- devFpga: 'HG'
+ devFpga: 'HG,XG'
devtestPattern: 'x3x0'
jtagSerial: '2516352244AD'
jtagServer: 'nitest@sdr-rhombus'
diff --git a/.ci/templates/job-uhd-devtest.yml b/.ci/templates/job-uhd-devtest.yml
index 2febdbbcf..033ab6a51 100644
--- a/.ci/templates/job-uhd-devtest.yml
+++ b/.ci/templates/job-uhd-devtest.yml
@@ -101,7 +101,8 @@ jobs:
export PATH=$(Build.BinariesDirectory)/uhddev/build/utils:$(Build.BinariesDirectory)/uhddev/build/examples:$PATH
export LD_LIBRARY_PATH=$(Build.BinariesDirectory)/uhddev/build/lib:$LD_LIBRARY_PATH
python3 ${{ parameters.uhdSrcDir }}/.ci/utils/mutex_hardware.py \
- --jtag_x3xx $(jtagServer),$(jtagSerial),$(Build.BinariesDirectory)/uhddev/build/fpga_images/usrp_$(devModel)_fpga_$(devFpga).bit \
+ --jtag_x3xx $(jtagServer),$(jtagSerial),$(devModel),$(Build.BinariesDirectory)/uhddev/build/fpga_images/ \
+ --fpgas $(devFpga) \
${{ parameters.redisHost }} $(devName) \
"$(Build.BinariesDirectory)/uhddev/build/utils/uhd_usrp_probe --args addr=$(devAddr)" \
"python3 ${{ parameters.uhdSrcDir }}/host/tests/devtest/run_testsuite.py \
@@ -126,7 +127,17 @@ jobs:
$(Common.TestResultsDirectory)/devtest/devtestresults.xml
continueOnError: true
displayName: Format devtest xml
- condition: always()
+ condition: and(always(), eq(variables.devType, 'b200'))
+
+ - script: |
+ cd $(Common.TestResultsDirectory)/devtest
+ python3 ${{ parameters.uhdSrcDir }}/.ci/utils/format_devtest_junitxml.py \
+ --fpgas $(devFpga) \
+ $(Common.TestResultsDirectory)/devtest \
+ $(Common.TestResultsDirectory)/devtest/devtestresults.xml
+ continueOnError: true
+ displayName: Format devtest xml
+ condition: and(always(), ne(variables.devType, 'b200'))
- publish: $(Common.TestResultsDirectory)
artifact: test-logs-devtest-$(devName)-$(devFpga)-run$(System.JobAttempt)
@@ -137,7 +148,7 @@ jobs:
inputs:
testResultsFormat: 'JUnit'
testResultsFiles: '$(Common.TestResultsDirectory)/devtest/devtestresults.xml'
- testRunTitle: $(devName) $(devFpga) devtest
+ testRunTitle: $(devName) devtest
buildConfiguration: 'Release'
mergeTestResults: true
failTaskOnFailedTests: true
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-12 21:21:35 +0000