From 8720fe87ec32af611f85d3289f4c533a996f3da6 Mon Sep 17 00:00:00 2001 From: Grant Meyerhoff Date: Mon, 31 Aug 2026 13:53:26 -0500 Subject: [PATCH] ci: download b3xx images rather than hardcoding --- .ci/templates/job-uhd-devtest.yml | 2 +- .ci/templates/job-uhd-rf-tests.yml | 2 +- .ci/templates/job-uhd-streaming-tests.yml | 4 +++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/.ci/templates/job-uhd-devtest.yml b/.ci/templates/job-uhd-devtest.yml index 25f9d9084..a342da570 100644 --- a/.ci/templates/job-uhd-devtest.yml +++ b/.ci/templates/job-uhd-devtest.yml @@ -254,7 +254,7 @@ jobs: export UHD_IMAGES_DIR=$(Build.BinariesDirectory)/uhddev/build/fpga_images uhd_image_loader --args type=$(devType),serial=$(devSerial) sleep 10 - export UHD_IMAGES_DIR=$HOME/adrv9032_images + $(Build.BinariesDirectory)/uhddev/build-installed/bin/uhd_images_downloader -t b3xx -t fw uhd_usrp_probe --args type=$(devType),serial=$(devSerial) python3 ${{ parameters.uhdSrcDir }}/uhddev/host/tests/devtest/run_testsuite.py \ --src-dir ${{ parameters.uhdSrcDir }}/uhddev/host/tests/devtest \ diff --git a/.ci/templates/job-uhd-rf-tests.yml b/.ci/templates/job-uhd-rf-tests.yml index ac597ca4a..c00751e93 100644 --- a/.ci/templates/job-uhd-rf-tests.yml +++ b/.ci/templates/job-uhd-rf-tests.yml @@ -256,7 +256,7 @@ jobs: cd $(Build.SourcesDirectory)/ettus-rts/config/remote/python_tests/pytests uhd_image_loader --args type=$(devType),serial=$(devSerial) sleep 10 - export UHD_IMAGES_DIR=$HOME/adrv9032_images + uhd_images_downloader -t b3xx -t fw uhd_usrp_probe --args type=$(devType),serial=$(devSerial) python3 ../automated_main.py --ats_config $(pytestAtsConfig) --dut $(pytestDUT) \ --results_path $(Common.TestResultsDirectory)/pytest/rf/$(devFpga) ${{ parameters.extra_rf_test_args }} || rf_test_status=$? diff --git a/.ci/templates/job-uhd-streaming-tests.yml b/.ci/templates/job-uhd-streaming-tests.yml index b7be80061..35528a663 100644 --- a/.ci/templates/job-uhd-streaming-tests.yml +++ b/.ci/templates/job-uhd-streaming-tests.yml @@ -402,7 +402,9 @@ jobs: displayName: remove old test results no dpdk - script: | - export UHD_IMAGES_DIR=$(Build.BinariesDirectory)/uhddev/build-installed/share/uhd/images/:$HOME/adrv9032_images + export UHD_IMAGES_DIR=$(Build.BinariesDirectory)/uhddev/build-installed/share/uhd/images/ + mkdir -p $(UHD_IMAGES_DIR) + $(Build.BinariesDirectory)/uhddev/build-installed/bin/uhd_images_downloader -t b3xx -t fw echo '##vso[task.setvariable variable=UHD_IMAGES_DIR]'$UHD_IMAGES_DIR echo UHD_IMAGES_DIR=$UHD_IMAGES_DIR displayName: Set UHD_IMAGES_DIR for B3xx