diff options
| author | Steven Koo <steven.koo@ni.com> | 2022-06-03 13:17:09 -0500 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2022-06-10 13:24:06 -0500 |
| commit | ea0dded3ecfa98420934c3329e4f4a73da22f9d5 (patch) | |
| tree | 301bf4d00044cef318e9b38dd71db3b51fae6eb0 /.ci/templates/job-uhd-devtest.yml | |
| parent | 693ec038b66520b0f868cee0338d00e3eb766548 (diff) | |
| download | uhd-ea0dded3ecfa98420934c3329e4f4a73da22f9d5.tar.gz uhd-ea0dded3ecfa98420934c3329e4f4a73da22f9d5.tar.bz2 uhd-ea0dded3ecfa98420934c3329e4f4a73da22f9d5.zip | |
ci: Run multiple fpgas per job
This consolidates the different FPGA runs into a single job.
Signed-off-by: Steven Koo <steven.koo@ni.com>
Diffstat (limited to '.ci/templates/job-uhd-devtest.yml')
| -rw-r--r-- | .ci/templates/job-uhd-devtest.yml | 17 |
1 files changed, 14 insertions, 3 deletions
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 |