diff options
| author | mattprost <matt.prost@ni.com> | 2022-05-24 16:39:10 -0500 |
|---|---|---|
| committer | Aaron Rossetto <aaron.rossetto@ni.com> | 2022-06-10 13:24:05 -0500 |
| commit | e4ce7737ea05c07bc174e6f5e2b485cdb83f42ba (patch) | |
| tree | 7377e850e5e1200c0f28832f6a003dddd0921ed7 | |
| parent | ab92ee008d5d88d8aa25f946aa83a7782ecdd9ee (diff) | |
| download | uhd-e4ce7737ea05c07bc174e6f5e2b485cdb83f42ba.tar.gz uhd-e4ce7737ea05c07bc174e6f5e2b485cdb83f42ba.tar.bz2 uhd-e4ce7737ea05c07bc174e6f5e2b485cdb83f42ba.zip | |
ci: Add b210 hardware to rhombus
Installed a B210 and added support for usb-based devices in the devtest
pipeline.
Signed-off-by: mattprost <matt.prost@ni.com>
| -rw-r--r-- | .ci/templates/job-uhd-devtest-rhombus.yml | 8 | ||||
| -rw-r--r-- | .ci/templates/job-uhd-devtest.yml | 25 |
2 files changed, 32 insertions, 1 deletions
diff --git a/.ci/templates/job-uhd-devtest-rhombus.yml b/.ci/templates/job-uhd-devtest-rhombus.yml index df54d0565..71c0a01dc 100644 --- a/.ci/templates/job-uhd-devtest-rhombus.yml +++ b/.ci/templates/job-uhd-devtest-rhombus.yml @@ -148,3 +148,11 @@ jobs: devtestPattern: 'x3x0' jtagSerial: '2516352244AD' jtagServer: 'nitest@sdr-rhombus' + + rhombus-b210-0: + devType: 'b200' + devModel: 'b210' + devName: rhombus-b210-0 + devSerial: '3218D0E' + devBus: 'usb' + devtestPattern: 'b2xx' diff --git a/.ci/templates/job-uhd-devtest.yml b/.ci/templates/job-uhd-devtest.yml index a0e8dc137..c217fce01 100644 --- a/.ci/templates/job-uhd-devtest.yml +++ b/.ci/templates/job-uhd-devtest.yml @@ -60,6 +60,10 @@ jobs: rm -rf fpga_images/* python3 utils/uhd_images_downloader.py -t $(devModel) -i fpga_images \ -b $(sdr-fileserver) + if [ "$(devType)" = "b200" ]; then + python3 utils/uhd_images_downloader.py -t b2xx_common -i fpga_images \ + -b $(sdr-fileserver) + fi displayName: Download FPGA Images - script: | @@ -67,6 +71,25 @@ jobs: cd $(Common.TestResultsDirectory)/devtest 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 + export UHD_IMAGES_DIR=$(Build.BinariesDirectory)/uhddev/build/fpga_images + python3 ${{ parameters.uhdSrcDir }}/.ci/utils/mutex_hardware.py \ + ${{ parameters.redisHost }} $(devName) \ + "$(Build.BinariesDirectory)/uhddev/build/utils/uhd_usrp_probe --args serial=$(devSerial)" \ + "$(Build.BinariesDirectory)/uhddev/build/utils/uhd_image_loader --args serial=$(devSerial),type=$(devType)" \ + "python3 ${{ parameters.uhdSrcDir }}/host/tests/devtest/run_testsuite.py \ + --src-dir ${{ parameters.uhdSrcDir }}/host/tests/devtest \ + --devtest-pattern $(devtestPattern) --args serial=$(devSerial),type=$(devType) \ + --build-type Release --build-dir $(Build.BinariesDirectory)/uhddev/build \ + --python-interp python3 --xml" + continueOnError: true + condition: and(succeeded(), eq(variables.devType, 'b200'), eq(variables.devBus, 'usb')) + displayName: Run b2xx devtest on $(devName) + + - script: | + mkdir -p $(Common.TestResultsDirectory)/devtest + cd $(Common.TestResultsDirectory)/devtest + 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 \ ${{ parameters.redisHost }} $(devName) \ @@ -78,7 +101,7 @@ jobs: --python-interp python3 --xml" continueOnError: true condition: and(succeeded(), eq(variables.devType, 'x300'), eq(variables.devBus, 'ip')) - displayName: Run devtest on $(devName) $(devFpga) + displayName: Run x3xx devtest on $(devName) $(devFpga) - script: | cat $(Common.TestResultsDirectory)/devtest/log*.log |