From e4ce7737ea05c07bc174e6f5e2b485cdb83f42ba Mon Sep 17 00:00:00 2001 From: mattprost Date: Tue, 24 May 2022 16:39:10 -0500 Subject: ci: Add b210 hardware to rhombus Installed a B210 and added support for usb-based devices in the devtest pipeline. Signed-off-by: mattprost --- .ci/templates/job-uhd-devtest-rhombus.yml | 8 ++++++++ .ci/templates/job-uhd-devtest.yml | 25 ++++++++++++++++++++++++- 2 files changed, 32 insertions(+), 1 deletion(-) 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,8 +60,31 @@ 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: | + 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 + 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 @@ -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 -- cgit v1.2.3