hero123457/uhd
1
0
Fork 0
mirror of https://github.com/EttusResearch/uhd.git synced 2026-10-25 17:36:10 +00:00
Code Issues Projects Releases Wiki Activity

ci: replace static obx rftest parameters by variables

Browse Source
This commit is contained in:
Frank Dietze 2026-09-15 13:58:43 +02:00 committed by Frank Dietze
parent 5ff8ca11f3
commit 2fa91b605a
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.ci/templates/job-uhd-devtest-x310-obx.yml
View File

@ -20,7 +20,7 @@ jobs:
uhdArtifactSource: '${{ parameters.uhdArtifactSource }}'
uhdFpgaArtifactSource: '${{ parameters.uhdFpgaArtifactSource }}'
fpga_imgs_source: '${{ parameters.fpga_imgs_source }}'
redisHost: 'sdr-osmium-test'
redisHost: $(host_redisHost)
vivado_dir: '/opt/Xilinx/Vivado_Lab/2023.2/'
dutMatrix:
x310-OBX:
@ -34,4 +34,4 @@ jobs:
devFpga: 'HG,XG'
devtestPattern: 'x3x0'
jtagSerial: $(x310_OBX_jtagSerial)
jtagServer: 'nitest@sdr-osmium-test'
jtagServer: $(host_jtagServer)

8
.ci/templates/job-uhd-rf-tests-x310-obx.yml
View File

@ -24,7 +24,7 @@ jobs:
uhdArtifactSource: '${{ parameters.uhdArtifactSource }}'
uhdFpgaArtifactSource: ${{ parameters.uhdFpgaArtifactSource }}
fpga_imgs_source: '${{ parameters.fpga_imgs_source }}'
redisHost: 'sdr-osmium-test'
redisHost: $(host_redisHost)
vivado_dir: '/opt/Xilinx/Vivado_Lab/2023.2/'
extra_rf_test_args: '${{ parameters.extra_rf_test_args }}'
dutMatrix:
@ -37,12 +37,12 @@ jobs:
db1Serial: '34A3BA0'
supportsCorrections: true
devBus: 'ip'
devAddr: '192.168.40.2'
sfpAddrs: '192.168.40.2'
devAddr: $(x310_OBX_devAddr)
sfpAddrs: $(x310_OBX_devAddr)
devFpga: 'XG'
devtestPattern: 'x300'
pytestDUT: 'x310'
pytestAtsConfig: 'osmium_ats'
pipelineAgent: 'obx-ats-agent'
jtagSerial: $(x310_OBX_jtagSerial)
jtagServer: 'nitest@sdr-osmium-test'
jtagServer: $(host_jtagServer)

3
.ci/templates/job-uhd-rf-tests.yml
View File

@ -241,6 +241,7 @@ jobs:
"python3 ../automated_main.py --ats_config $(pytestAtsConfig) --dut $(pytestDUT) \
--test_selector $(Build.SourcesDirectory)/ettus-rts/config/remote/python_tests/pytests \
--results_path $(Common.TestResultsDirectory)/pytest/rf/$(devFpga) \
--run_vars_overrides "mgmt_addr=$(devAddr)" --run_vars_overrides "addr=$(devAddr)" \
$(parameters.extra_rf_test_args)" || rf_test_status=$?
elif [ "$(devType)" = "x300" ]; then
python3 ${{ parameters.uhdSrcDir }}/.ci/utils/mutex_hardware.py \
@ -252,6 +253,7 @@ jobs:
"python3 ../automated_main.py --ats_config $(pytestAtsConfig) --dut $(pytestDUT) \
--test_selector $(Build.SourcesDirectory)/ettus-rts/config/remote/python_tests/pytests \
--results_path $(Common.TestResultsDirectory)/pytest/rf/$(devFpga) \
--run_vars_overrides "mgmt_addr=$(devAddr)" --run_vars_overrides "addr=$(devAddr)" \
$(parameters.extra_rf_test_args)" || rf_test_status=$?
elif [ "$(devType)" = "b3xx" ]; then
cd $(Build.SourcesDirectory)/ettus-rts/config/remote/python_tests/pytests
@ -266,6 +268,7 @@ jobs:
python3 automated_main.py --ats_config $(pytestAtsConfig) --dut $(pytestDUT) \
--test_selector $(Build.SourcesDirectory)/ettus-rts/config/remote/python_tests/pytests_non_rf \
--results_path $(Common.TestResultsDirectory)/pytest/non_rf/$(devFpga) \
--run_vars_overrides "mgmt_addr=$(devAddr)" --run_vars_overrides "addr=$(devAddr)" \
${{ parameters.extra_rf_test_args }} || non_rf_test_status=$?
if [ $rf_test_status -ne 0 ] || [ $non_rf_test_status -ne 0 ]; then