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: Remove rhombus-labgrid files

Browse Source
This commit is contained in:
Aki Tomita 2025-07-14 09:05:06 -05:00 committed by Jörg Hofrichter
parent 56363ccde6
commit bf8c552e34
8 changed files with 30 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.ci/templates/job-uhd-devtest-rhombus.yml
View File

@ -105,7 +105,7 @@ jobs:
devFpga: 'HG,XG'
devtestPattern: 'n3x0'
devSDImage: gnuradio-image-ni-sulfur-rev11-mender.sdimg.bz2
devLabgridConfig: .ci/templates/tests/rhombus-labgrid/device-configs/rhombus-n310-0.yml
devLabgridConfig: config/labgrid/rhombus-labgrid/device-configs/rhombus-n310-0.yml
rhombus-n321-0:
devType: 'n3xx'
devModel: 'n320'
@ -118,7 +118,7 @@ jobs:
devFpga: 'HG,XG,XQ'
devtestPattern: 'n3x0'
devSDImage: gnuradio-image-ni-sulfur-rev11-mender.sdimg.bz2
devLabgridConfig: .ci/templates/tests/rhombus-labgrid/device-configs/rhombus-n321-0.yml
devLabgridConfig: config/labgrid/rhombus-labgrid/device-configs/rhombus-n321-0.yml
${{ if contains(parameters.testDevices, 'e320') }}:
rhombus-e320-0:
@ -134,4 +134,4 @@ jobs:
devtestPattern: 'e320'
devInitramfsImage: fitImage-manufacturing
devSDImage: gnuradio-image-ni-neon-rev2-mender.sdimg.bz2
devLabgridConfig: .ci/templates/tests/rhombus-labgrid/device-configs/rhombus-e320-0.yml
devLabgridConfig: config/labgrid/rhombus-labgrid/device-configs/rhombus-e320-0.yml

51
.ci/templates/job-uhd-devtest.yml
View File

@ -39,6 +39,9 @@ jobs:
clean: outputs
steps:
- checkout: ettus-rts
clean: true
- checkout: self
clean: true
@ -138,21 +141,21 @@ jobs:
cd $(Agent.TempDirectory)
python3 -m venv devtest_venv
source devtest_venv/bin/activate
pip3 install -r $(Build.SourcesDirectory)/host/tests/devtest/requirements.txt
pip3 install -r $(Build.SourcesDirectory)/.ci/utils/requirements.txt
pip3 install -r $(Build.SourcesDirectory)/uhddev/host/tests/devtest/requirements.txt
pip3 install -r $(Build.SourcesDirectory)/uhddev/.ci/utils/requirements.txt
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 \
--sdimage_sdmux $(devType),$(devModel),$(uhd_artifact_directory)/$(devType)-images/$(devSDImage),${{ parameters.uhdSrcDir }}/$(devLabgridConfig),$(devHostname) \
python3 ${{ parameters.uhdSrcDir }}/uhddev/.ci/utils/mutex_hardware.py \
--sdimage_sdmux $(devType),$(devModel),$(uhd_artifact_directory)/$(devType)-images/$(devSDImage),$(Build.SourcesDirectory)/ettus-rts/$(devLabgridConfig),$(devHostname) \
--fpgas $(devFpga) \
--sfp_addrs $(sfpAddrs) \
"${{ parameters.redisHost }}" "$(devName)" \
"$(Build.BinariesDirectory)/uhddev/build/utils/uhd_usrp_probe --args addr=$(devAddr)" \
"python3 ${{ parameters.uhdSrcDir }}/host/tests/devtest/run_testsuite.py \
--src-dir ${{ parameters.uhdSrcDir }}/host/tests/devtest \
"python3 ${{ parameters.uhdSrcDir }}/uhddev/host/tests/devtest/run_testsuite.py \
--src-dir ${{ parameters.uhdSrcDir }}/uhddev/host/tests/devtest \
--devtest-pattern $(devtestPattern) --args addr=$(devAddr),type=$(devType) \
--build-type Release --build-dir $(Build.BinariesDirectory)/uhddev/build \
--python-interp python3 --xml"
@ -164,21 +167,21 @@ jobs:
cd $(Agent.TempDirectory)
python3 -m venv devtest_venv
source devtest_venv/bin/activate
pip3 install -r $(Build.SourcesDirectory)/host/tests/devtest/requirements.txt
pip3 install -r $(Build.SourcesDirectory)/.ci/utils/requirements.txt
pip3 install -r $(Build.SourcesDirectory)/uhddev/host/tests/devtest/requirements.txt
pip3 install -r $(Build.SourcesDirectory)/uhddev/.ci/utils/requirements.txt
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 \
--sdimage_tftp $(devType),$(devModel),$(uhd_artifact_directory)/e320-images/$(devSDImage),$(uhd_artifact_directory)/e320-images/$(devInitramfsImage),${{ parameters.uhdSrcDir }}/$(devLabgridConfig) \
python3 ${{ parameters.uhdSrcDir }}/uhddev/.ci/utils/mutex_hardware.py \
--sdimage_tftp $(devType),$(devModel),$(uhd_artifact_directory)/e320-images/$(devSDImage),$(uhd_artifact_directory)/e320-images/$(devInitramfsImage),$(Build.SourcesDirectory)/ettus-rts/$(devLabgridConfig) \
--fpgas $(devFpga) \
--sfp_addrs $(sfpAddrs) \
"${{ parameters.redisHost }}" "$(devName)" \
"$(Build.BinariesDirectory)/uhddev/build/utils/uhd_usrp_probe --args addr=$(devAddr)" \
"python3 ${{ parameters.uhdSrcDir }}/host/tests/devtest/run_testsuite.py \
--src-dir ${{ parameters.uhdSrcDir }}/host/tests/devtest \
"python3 ${{ parameters.uhdSrcDir }}/uhddev/host/tests/devtest/run_testsuite.py \
--src-dir ${{ parameters.uhdSrcDir }}/uhddev/host/tests/devtest \
--devtest-pattern $(devtestPattern) --args addr=$(devAddr),type=$(devType) \
--build-type Release --build-dir $(Build.BinariesDirectory)/uhddev/build \
--python-interp python3 --xml"
@ -190,19 +193,19 @@ jobs:
cd $(Agent.TempDirectory)
python3 -m venv devtest_venv
source devtest_venv/bin/activate
pip3 install -r $(Build.SourcesDirectory)/host/tests/devtest/requirements.txt
pip3 install -r $(Build.SourcesDirectory)/.ci/utils/requirements.txt
pip3 install -r $(Build.SourcesDirectory)/uhddev/host/tests/devtest/requirements.txt
pip3 install -r $(Build.SourcesDirectory)/uhddev/.ci/utils/requirements.txt
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 \
python3 ${{ parameters.uhdSrcDir }}/uhddev/.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 \
"python3 ${{ parameters.uhdSrcDir }}/uhddev/host/tests/devtest/run_testsuite.py \
--src-dir ${{ parameters.uhdSrcDir }}/uhddev/host/tests/devtest \
--devtest-pattern $(devtestPattern) --args serial=$(devSerial),type=$(devType) \
--build-type Release --build-dir $(Build.BinariesDirectory)/uhddev/build \
--python-interp python3 --xml"
@ -214,19 +217,19 @@ jobs:
cd $(Agent.TempDirectory)
python3 -m venv devtest_venv
source devtest_venv/bin/activate
pip3 install -r $(Build.SourcesDirectory)/host/tests/devtest/requirements.txt
pip3 install -r $(Build.SourcesDirectory)/.ci/utils/requirements.txt
pip3 install -r $(Build.SourcesDirectory)/uhddev/host/tests/devtest/requirements.txt
pip3 install -r $(Build.SourcesDirectory)/uhddev/.ci/utils/requirements.txt
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 \
python3 ${{ parameters.uhdSrcDir }}/uhddev/.ci/utils/mutex_hardware.py \
--jtag_x3xx $(devType),$(devModel),$(jtagServer),$(jtagSerial),$(Build.BinariesDirectory)/uhddev/build/fpga_images/,${{ parameters.vivado_dir }} \
--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 \
--src-dir ${{ parameters.uhdSrcDir }}/host/tests/devtest \
"python3 ${{ parameters.uhdSrcDir }}/uhddev/host/tests/devtest/run_testsuite.py \
--src-dir ${{ parameters.uhdSrcDir }}/uhddev/host/tests/devtest \
--devtest-pattern $(devtestPattern) --args addr=$(devAddr),type=$(devType) \
--build-type Release --build-dir $(Build.BinariesDirectory)/uhddev/build \
--python-interp python3 --xml"
@ -242,7 +245,7 @@ jobs:
- script: |
cd $(Common.TestResultsDirectory)/devtest
python3 ${{ parameters.uhdSrcDir }}/.ci/utils/format_devtest_junitxml.py \
python3 ${{ parameters.uhdSrcDir }}/uhddev/.ci/utils/format_devtest_junitxml.py \
$(Common.TestResultsDirectory)/devtest \
$(Common.TestResultsDirectory)/devtest/devtestresults.xml
continueOnError: true
@ -251,7 +254,7 @@ jobs:
- script: |
cd $(Common.TestResultsDirectory)/devtest
python3 ${{ parameters.uhdSrcDir }}/.ci/utils/format_devtest_junitxml.py \
python3 ${{ parameters.uhdSrcDir }}/uhddev/.ci/utils/format_devtest_junitxml.py \
--fpgas $(devFpga) \
$(Common.TestResultsDirectory)/devtest \
$(Common.TestResultsDirectory)/devtest/devtestresults.xml

50
.ci/templates/tests/rhombus-labgrid/crossbar/places.yaml
View File

@ -1,50 +0,0 @@
rhombus-n310-0:
acquired: null
acquired_resources: []
aliases: []
allowed: []
changed: 1654034475.1935894
comment: ''
created: 1654034136.0077882
matches:
- cls: '*'
exporter: '*'
group: rhombus-n310-0-group
name: null
rename: null
reservation: null
tags: {}
rhombus-n321-0:
acquired: null
acquired_resources: []
aliases: []
allowed: []
changed: 1654034475.1935894
comment: ''
created: 1654034136.0077882
matches:
- cls: '*'
exporter: '*'
group: rhombus-n321-0-group
name: null
rename: null
reservation: null
tags: {}
rhombus-e320-0:
acquired: null
acquired_resources: []
aliases: []
allowed: []
changed: 1654034475.1935894
comment: ''
created: 1654034136.0077882
matches:
- cls: '*'
exporter: '*'
group: rhombus-e320-0-group
name: null
rename: null
reservation: null
tags: {}

14
.ci/templates/tests/rhombus-labgrid/device-configs/rhombus-e320-0.yml
View File

@ -1,14 +0,0 @@
targets:
main:
resources:
RemotePlace:
name: 'rhombus-e320-0'
drivers:
- SerialDriver:
name: 'linux_serial_driver'
bindings:
port: 'console-linux'
- SerialDriver:
name: 'scu_serial_driver'
bindings:
port: 'console-scu'

16
.ci/templates/tests/rhombus-labgrid/device-configs/rhombus-n310-0.yml
View File

@ -1,16 +0,0 @@
targets:
main:
resources:
RemotePlace:
name: 'rhombus-n310-0'
drivers:
- SerialDriver:
name: 'linux_serial_driver'
bindings:
port: 'console-linux'
- SerialDriver:
name: 'scu_serial_driver'
bindings:
port: 'console-scu'
- USBSDMuxDriver: {}
- USBStorageDriver: {}

16
.ci/templates/tests/rhombus-labgrid/device-configs/rhombus-n321-0.yml
View File

@ -1,16 +0,0 @@
targets:
main:
resources:
RemotePlace:
name: 'rhombus-n321-0'
drivers:
- SerialDriver:
name: 'linux_serial_driver'
bindings:
port: 'console-linux'
- SerialDriver:
name: 'scu_serial_driver'
bindings:
port: 'console-scu'
- USBSDMuxDriver: {}
- USBStorageDriver: {}

26
.ci/templates/tests/rhombus-labgrid/docker-compose.yml
View File

@ -1,26 +0,0 @@
version: '3.3'
services:
coordinator:
image: "labgrid-coordinator"
volumes:
- "./crossbar:/home/root/crossbar:Z"
tty: true
network_mode: "host"
restart: unless-stopped
command: bash -c "cp /home/root/crossbar/places.yaml /opt/crossbar/places.yaml &&
crossbar start --config /opt/labgrid/.crossbar/config.yaml"
exporter:
image: "labgrid-exporter"
volumes:
- "./exporter-conf:/opt/conf:Z"
- "/run/udev:/run/udev:ro"
- "/dev:/dev"
depends_on:
- coordinator
tty: true
network_mode: "host"
restart: unless-stopped
stdin_open: true
privileged: true
command: bash -c "set -e &&
/opt/wait-for-it/wait-for-it.sh 127.0.0.1:20408 -- labgrid-exporter /opt/conf/exporter.yaml"

47
.ci/templates/tests/rhombus-labgrid/exporter-conf/exporter.yaml
View File

@ -1,47 +0,0 @@
rhombus-n310-0-group:
console-scu:
cls: USBSerialPort
match:
ID_SERIAL: 'Silicon_Labs_CP2105_Dual_USB_to_UART_Bridge_Controller_00B56B20'
ID_USB_INTERFACE_NUM: '01'
speed: 115200
console-linux:
cls: USBSerialPort
match:
ID_SERIAL: 'Silicon_Labs_CP2105_Dual_USB_to_UART_Bridge_Controller_00B56B20'
ID_USB_INTERFACE_NUM: '00'
speed: 115200
USBSDMuxDevice:
match:
ID_SERIAL_SHORT: '000000001506'
rhombus-n321-0-group:
console-scu:
cls: USBSerialPort
match:
ID_SERIAL: 'Silicon_Labs_CP2105_Dual_USB_to_UART_Bridge_Controller_0097D610'
ID_USB_INTERFACE_NUM: '01'
speed: 115200
console-linux:
cls: USBSerialPort
match:
ID_SERIAL: 'Silicon_Labs_CP2105_Dual_USB_to_UART_Bridge_Controller_0097D610'
ID_USB_INTERFACE_NUM: '00'
speed: 115200
USBSDMuxDevice:
match:
ID_SERIAL_SHORT: '000000001140'
rhombus-e320-0-group:
console-scu:
cls: USBSerialPort
match:
ID_SERIAL: 'Silicon_Labs_CP2105_Dual_USB_to_UART_Bridge_Controller_00B56B3A'
ID_USB_INTERFACE_NUM: '00'
speed: 115200
console-linux:
cls: USBSerialPort
match:
ID_SERIAL: 'Silicon_Labs_CP2105_Dual_USB_to_UART_Bridge_Controller_00B56B3A'
ID_USB_INTERFACE_NUM: '01'
speed: 115200