diff --git a/ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-4L-vvdn.conf b/ci-scripts/conf_files/gnb.band77.273prb.fhi72.4x4-vvdn-phytest.conf similarity index 100% rename from ci-scripts/conf_files/gnb.sa.band77.273prb.fhi72.4x4-4L-vvdn.conf rename to ci-scripts/conf_files/gnb.band77.273prb.fhi72.4x4-vvdn-phytest.conf diff --git a/ci-scripts/xml_files/gnb_phytest_fhi7.2_docker.xml b/ci-scripts/xml_files/gnb_phytest_fhi7.2_docker.xml index 5386ba4d83..309f1784b6 100644 --- a/ci-scripts/xml_files/gnb_phytest_fhi7.2_docker.xml +++ b/ci-scripts/xml_files/gnb_phytest_fhi7.2_docker.xml @@ -25,13 +25,6 @@ Timing phytest 100 MHz 4x4 FHI7.2 tasks - - Custom_Script - Setup sriov and network interfaces for dummy (no RU) - bulbul - - - Pull_Local_Registry Pull Images from Local Registry diff --git a/ci-scripts/yaml_files/phytest_fhi72/docker-compose.yaml b/ci-scripts/yaml_files/phytest_fhi72/docker-compose.yaml index 46fbc24302..15de7ef931 100644 --- a/ci-scripts/yaml_files/phytest_fhi72/docker-compose.yaml +++ b/ci-scripts/yaml_files/phytest_fhi72/docker-compose.yaml @@ -1,4 +1,16 @@ services: + dpdk-init: + image: docker.io/library/oai-dpdk-init:latest + network_mode: host + container_name: dpdk-init + entrypoint: "/tmp/setup_sriov.sh" + privileged: true + devices: + - /dev/vfio:/dev/vfio/ + volumes: + - ./setup_sriov_dummy.sh:/tmp/setup_sriov.sh + - /lib/modules:/lib/modules + - /usr/lib/modules:/usr/lib/modules oai-gnb: image: ${REGISTRY-oaisoftwarealliance/}${GNB_IMG:-oai-gnb-fhi72}:${TAG:-develop} container_name: oai-gnb-phytest @@ -12,11 +24,24 @@ services: devices: - /dev/vfio:/dev/vfio/ volumes: - - ../../conf_files/gnb.sa.band77.273prb.fhi72.4x4-4L-vvdn.conf:/opt/oai-gnb/etc/gnb.conf + - ../../conf_files/gnb.band77.273prb.fhi72.4x4-vvdn-phytest.conf:/opt/oai-gnb/etc/gnb.conf - /dev/hugepages:/dev/hugepages - cpuset: "8,9,10,11,12,13,14,15,16,17,18,19,20,21,22,23" + cpuset: "8-23" + networks: ["public_net"] + depends_on: + dpdk-init: + condition: service_completed_successfully healthcheck: test: /bin/bash -c "pgrep nr-softmodem" interval: 10s timeout: 5s retries: 5 +networks: + public_net: + driver: bridge + name: ci-physim + ipam: + config: + - subnet: 192.168.71.128/26 + driver_opts: + com.docker.network.bridge.name: "ci-physim" diff --git a/ci-scripts/yaml_files/phytest_fhi72/setup_sriov_dummy.sh b/ci-scripts/yaml_files/phytest_fhi72/setup_sriov_dummy.sh index c18affb0a9..74a1f627fc 100755 --- a/ci-scripts/yaml_files/phytest_fhi72/setup_sriov_dummy.sh +++ b/ci-scripts/yaml_files/phytest_fhi72/setup_sriov_dummy.sh @@ -19,19 +19,19 @@ IF_NAME=ens1f0np0 C_U_PLANE_MAC_ADD=22:11:55:33:99:55 C_U_PLANE_VLAN=123 MTU=9000 -DPDK_DEVBIND_PREFIX=/home/oaicicd/test/dpdk-stable-22.11.7/bin +DPDK_DEVBIND_PREFIX=/usr/local/bin NUM_VFs=1 -sudo ethtool -G $IF_NAME rx 8160 tx 8160 -sudo sh -c "echo 0 > /sys/class/net/$IF_NAME/device/sriov_numvfs" -sudo sh -c "echo $NUM_VFs > /sys/class/net/$IF_NAME/device/sriov_numvfs" +ethtool -G $IF_NAME rx 8160 tx 8160 +sh -c "echo 0 > /sys/class/net/$IF_NAME/device/sriov_numvfs" +sh -c "echo $NUM_VFs > /sys/class/net/$IF_NAME/device/sriov_numvfs" C_U_PLANE_PCI=$(pci_addr $IF_NAME 0) # this next 2 lines is for C/U planes -sudo ip link set $IF_NAME vf 0 mac $C_U_PLANE_MAC_ADD vlan $C_U_PLANE_VLAN spoofchk off mtu $MTU +ip link set $IF_NAME vf 0 mac $C_U_PLANE_MAC_ADD vlan $C_U_PLANE_VLAN spoofchk off mtu $MTU sleep 1 -sudo modprobe iavf -sudo ${DPDK_DEVBIND_PREFIX}/dpdk-devbind.py --unbind $C_U_PLANE_PCI -sudo modprobe vfio-pci -sudo ${DPDK_DEVBIND_PREFIX}/dpdk-devbind.py --bind vfio-pci $C_U_PLANE_PCI +modprobe iavf +${DPDK_DEVBIND_PREFIX}/dpdk-devbind.py --unbind $C_U_PLANE_PCI +modprobe vfio-pci +${DPDK_DEVBIND_PREFIX}/dpdk-devbind.py --bind vfio-pci $C_U_PLANE_PCI echo "Successfully configured C-PLANE and U-PLANE: - C-PLANE MAC: $C_U_PLANE_MAC_ADD, VLAN: $C_U_PLANE_VLAN, PCI: $C_U_PLANE_PCI" exit 0