From 189bf96528abc643cea2e5a5c47e6e6675376dba Mon Sep 17 00:00:00 2001 From: Peter Mikus Date: Mon, 23 Jun 2025 14:55:10 +0200 Subject: [PATCH] fix(infra): Altra topology Signed-off-by: Peter Mikus Change-Id: I7e42b6546561c2dcc0d027b01bdea4407b172e83 --- .../fdio_dc_testbed_specifications.md | 40 +++++++++++----------- .../infrastructure/fdio_dc_vexxhost_inventory.md | 4 +-- .../roles/docker_images/files/base/Dockerfile | 8 ++--- .../roles/docker_images/tasks/base.yaml | 2 +- .../templates/docker-compose-sut.yaml.j2 | 2 ++ fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf | 4 +-- .../tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4 | 2 +- .../tftpboot/grub/grub.cfg-90:e2:ba:55:be:32 | 2 +- .../ubuntu_noble_arm64/90:e2:ba:49:db:b4/user-data | 4 +-- .../ubuntu_noble_arm64/90:e2:ba:55:be:32/user-data | 4 +-- topologies/available/lf_3n_alt_testbed34.yaml | 36 +++++++++---------- 11 files changed, 55 insertions(+), 53 deletions(-) diff --git a/docs/content/infrastructure/fdio_dc_testbed_specifications.md b/docs/content/infrastructure/fdio_dc_testbed_specifications.md index ae5e158c09..5834a1a058 100644 --- a/docs/content/infrastructure/fdio_dc_testbed_specifications.md +++ b/docs/content/infrastructure/fdio_dc_testbed_specifications.md @@ -882,36 +882,36 @@ FD.io CSIT lab contains following server types: ``` - SUT [Server-Type-E23]: - testbedname: testbed34. - - hostname: s62-t34-sut1. + - hostname: s72-t34-sut1. - IPMI IP: 10.30.50.72 - Host IP: 10.30.51.72 - portnames: - - s62-t34-sut1-c1/p1 - 100GE-port1 ConnectX5-2p100GE. - - s62-t34-sut1-c1/p2 - 100GE-port2 ConnectX5-2p100GE. - - s62-t34-sut1-c8/p1 - 100GE-port1 ConnectX6-2p100GE. - - s62-t34-sut1-c8/p2 - 100GE-port2 ConnectX6-2p100GE. + - s72-t34-sut1-c1/p1 - 100GE-port1 ConnectX5-2p100GE. + - s72-t34-sut1-c1/p2 - 100GE-port2 ConnectX5-2p100GE. + - s72-t34-sut1-c8/p1 - 100GE-port1 ConnectX6-2p100GE. + - s72-t34-sut1-c8/p2 - 100GE-port2 ConnectX6-2p100GE. - SUT [Server-Type-E23]: - testbedname: testbed34. - - hostname: s63-t34-sut2. + - hostname: s73-t34-sut2. - IPMI IP: 10.30.50.73 - Host IP: 10.30.51.73 - portnames: - - s63-t34-sut2-c1/p1 - 100GE-port1 ConnectX5-2p100GE. - - s63-t34-sut2-c1/p2 - 100GE-port2 ConnectX5-2p100GE. - - s63-t34-sut2-c8/p1 - 100GE-port1 ConnectX6-2p100GE. - - s63-t34-sut2-c8/p2 - 100GE-port2 ConnectX6-2p100GE. + - s73-t34-sut2-c1/p1 - 100GE-port1 ConnectX5-2p100GE. + - s73-t34-sut2-c1/p2 - 100GE-port2 ConnectX5-2p100GE. + - s73-t34-sut2-c8/p1 - 100GE-port1 ConnectX6-2p100GE. + - s73-t34-sut2-c8/p2 - 100GE-port2 ConnectX6-2p100GE. - TG [Server-Type-E32]: - testbedname: testbed34. - - hostname: s64-t34-tg1. + - hostname: s74-t34-tg1. - IPMI IP: 10.30.50.74 - Host IP: 10.30.51.74 - portnames: - - s64-t34-tg1-c2/p1 - 25GE-port1 xxv710-DA2-2p25GE. - - s64-t34-tg1-c2/p2 - 25GE-port2 xxv710-DA2-2p25GE. - - s64-t34-tg1-c4/p1 - 40GE-port1 xl710-QDA2-2p40GE. - - s64-t34-tg1-c4/p2 - 40GE-port2 xl710-QDA2-2p40GE. - - s64-t34-tg1-c8/p1 - 100GE-port1 e810-2CQDA2-2p100GE. - - s64-t34-tg1-c8/p2 - 100GE-port2 e810-2CQDA2-2p100GE. + - s74-t34-tg1-c2/p1 - 25GE-port1 xxv710-DA2-2p25GE. + - s74-t34-tg1-c2/p2 - 25GE-port2 xxv710-DA2-2p25GE. + - s74-t34-tg1-c4/p1 - 40GE-port1 xl710-QDA2-2p40GE. + - s74-t34-tg1-c4/p2 - 40GE-port2 xl710-QDA2-2p40GE. + - s74-t34-tg1-c8/p1 - 100GE-port1 e810-2CQDA2-2p100GE. + - s74-t34-tg1-c8/p2 - 100GE-port2 e810-2CQDA2-2p100GE. ``` ### 3-Node-Icelake (3n-icx) @@ -1363,9 +1363,9 @@ FD.io CSIT lab contains following server types: ``` - testbed34: - ring2 100GE-ports ConnectX6-2p100GE Mellanox on SUTs: - - s64-t34-tg1-c8/p1 - s62-t34-sut2-c8/p1. - - s62-t34-sut1-c8/p1 - s63-t34-sut2-c8/p2. - - s63-t34-sut1-c8/p2 - s64-t34-tg1-c8/p2. + - s74-t34-tg1-c8/p1 - s72-t34-sut2-c8/p1. + - s72-t34-sut1-c8/p1 - s73-t34-sut2-c8/p2. + - s73-t34-sut1-c8/p2 - s74-t34-tg1-c8/p2. ``` ### 3-Node-Icelake (3n-icx) diff --git a/docs/content/infrastructure/fdio_dc_vexxhost_inventory.md b/docs/content/infrastructure/fdio_dc_vexxhost_inventory.md index bda1ef2b59..425d1038e1 100644 --- a/docs/content/infrastructure/fdio_dc_vexxhost_inventory.md +++ b/docs/content/infrastructure/fdio_dc_vexxhost_inventory.md @@ -91,8 +91,8 @@ Captured inventory data: s31-nomad | nomad-client | SYS-741GE-TNRT | C7490FL47A50149 | 10.30.51.31 | 10.30.50.31 | 3016.11 | u15-u18 s70-t13-sut1 | 1n-alt | E252-P30-00 | GMG252012A0098 | 10.30.51.70 | 10.30.50.70 | 3016.11 | u13-u14 s71-t14-sut1 | 1n-alt | E252-P30-00 | GMG252012A0089 | 10.30.51.71 | 10.30.50.71 | 3016.11 | u11-u12 - s72-t34-sut1 | 3n-alt | WIWYNN | 04000059N0SC | 10.30.51.72 | 10.30.50.72 | 3016.11 | u9-u10 - s73-t34-sut2 | 3n-alt | WIWYNN | 0390003EN0SC | 10.30.51.73 | 10.30.50.73 | 3016.11 | u7-u8 + s73-t34-sut2 | 3n-alt | WIWYNN | 04000059N0SC | 10.30.51.72 | 10.30.50.72 | 3016.11 | u9-u10 + s72-t34-sut1 | 3n-alt | WIWYNN | 0390003EN0SC | 10.30.51.73 | 10.30.50.73 | 3016.11 | u7-u8 s74-t34-tg1 | 3n-alt | SYS-740GP-TNRT | C7470KK40P50249 | 10.30.51.74 | 10.30.50.74 | 3016.11 | u3-u6 ### Rack YUL1-12 (3016.12) diff --git a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile index 347b106e6d..2ce67b47f3 100644 --- a/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile +++ b/fdio.infra.ansible/roles/docker_images/files/base/Dockerfile @@ -20,8 +20,8 @@ RUN apt-get update -qq \ && rm -r /var/lib/apt/lists/* ENV LANG="en_US.UTF-8" LANGUAGE="en_US" LC_ALL="en_US.UTF-8" -RUN apt-get -q update \ - && apt-get install -y -qq \ +RUN apt-get update -qq \ + && apt-get install -y \ build-essential \ ca-certificates \ libnuma-dev \ @@ -35,9 +35,9 @@ RUN apt-get -q update \ python3-virtualenv \ wget \ xz-utils \ - && wget --quiet http://fast.dpdk.org/rel/dpdk-$DPDK_VERSION.tar.xz \ + && wget --quiet http://fast.dpdk.org/rel/dpdk-${DPDK_VERSION}.tar.xz \ && mkdir --parents /dpdk \ - && tar --extract --file=dpdk-$DPDK_VERSION.tar.xz --directory=/dpdk --strip-components 1 + && tar --extract --file=dpdk-${DPDK_VERSION}.tar.xz --directory=/dpdk --strip-components 1 # CSIT PIP pre-cache RUN python3 -m venv venv \ diff --git a/fdio.infra.ansible/roles/docker_images/tasks/base.yaml b/fdio.infra.ansible/roles/docker_images/tasks/base.yaml index a3ded7466c..3a98be19e4 100644 --- a/fdio.infra.ansible/roles/docker_images/tasks/base.yaml +++ b/fdio.infra.ansible/roles/docker_images/tasks/base.yaml @@ -23,7 +23,7 @@ - docker-base - name: "Build CSIT Base Docker Image" - ansible.builtin.shell: "docker build --build-arg BASE_IMAGE=ubuntu:24.04 -t base-ubuntu2404:local ." + ansible.builtin.shell: "docker build --build-arg BASE_IMAGE=ubuntu:24.04 --build-arg DPDK_VERSION=24.11.1 -t base-ubuntu2404:local ." args: chdir: "/opt/csit-docker-images/base" async: 3000 diff --git a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2 b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2 index da74c78241..e1d1911b30 100644 --- a/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2 +++ b/fdio.infra.ansible/roles/docker_images/templates/docker-compose-sut.yaml.j2 @@ -5,6 +5,7 @@ services: dockerfile: "Dockerfile" args: BASE_IMAGE: "ubuntu:24.04" + DPDK_VERSION: "24.11.1" cap_add: - NET_RAW command: ["/usr/sbin/sshd","-D", "-p", "6001"] @@ -36,6 +37,7 @@ services: dockerfile: "Dockerfile" args: BASE_IMAGE: "ubuntu:24.04" + DPDK_VERSION: "24.11.1" cap_add: - NET_RAW command: ["/usr/sbin/sshd","-D", "-p", "6002"] diff --git a/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf b/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf index 75518288cf..5e0c67347f 100755 --- a/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf +++ b/fdio.infra/pxe/docker-dnsmasq/etc/dnsmasq.conf @@ -80,8 +80,8 @@ dhcp-host=3c:ec:ef:43:a3:ba,10.30.51.60,s60-t210-sut1,infinite # enp1s0f0np0 dhcp-host=3c:ec:ef:46:34:e8,10.30.51.61,s61-t210-tg1,infinite # enp1s0f0np0 ZN2 dhcp-host=d8:5e:d3:e7:aa:4c,10.30.51.70,s70-nomad,infinite # eno1/enP2p1s0f0 ALT dhcp-host=d8:5e:d3:e7:a9:6c,10.30.51.71,s71-nomad,infinite # eno1/enP2p1s0f0 ALT -dhcp-host=90:e2:ba:55:be:32,10.30.51.72,s72-t34-sut1,infinite # eno1 ALT -dhcp-host=90:e2:ba:49:db:b4,10.30.51.73,s73-t34-sut2,infinite # eno1 ALT +dhcp-host=90:e2:ba:49:db:b4,10.30.51.72,s72-t34-sut1,infinite # eno1 ALT +dhcp-host=90:e2:ba:55:be:32,10.30.51.73,s73-t34-sut2,infinite # eno1 ALT dhcp-host=3c:ec:ef:b9:cc:56,10.30.51.74,s74-t34-tg1,infinite # eno1 ICX dhcp-host=3c:ec:ef:b9:a6:ba,10.30.51.75,s75-t37-sut1,infinite # eno1 ICX dhcp-host=3c:ec:ef:b9:a6:80,10.30.51.76,s76-t37-sut2,infinite # eno1 ICX diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4 b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4 index 445f524195..4e951eb096 100644 --- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4 +++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:49:db:b4 @@ -1,4 +1,4 @@ -menuentry "Install s73-t34-sut2" { +menuentry "Install s72-t34-sut1" { linux /casper/ubuntu-noble-arm64/vmlinuz ip=dhcp url=http://10.30.51.24:8081/ubuntu_noble_arm64/ubuntu-24.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/90:e2:ba:49:db:b4/ --- initrd /casper/ubuntu-noble-arm64/initrd } \ No newline at end of file diff --git a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:55:be:32 b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:55:be:32 index e2af022b54..06087daf5c 100644 --- a/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:55:be:32 +++ b/fdio.infra/pxe/docker-dnsmasq/tftpboot/grub/grub.cfg-90:e2:ba:55:be:32 @@ -1,4 +1,4 @@ -menuentry "Install s72-t34-sut1" { +menuentry "Install s73-t34-sut2" { linux /casper/ubuntu-noble-arm64/vmlinuz ip=dhcp url=http://10.30.51.24:8081/ubuntu_noble_arm64/ubuntu-24.04.1-live-server-arm64.iso autoinstall ds=nocloud-net\;s=http://10.30.51.24:8081/ubuntu_noble_arm64/90:e2:ba:55:be:32/ --- initrd /casper/ubuntu-noble-arm64/initrd } \ No newline at end of file diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_arm64/90:e2:ba:49:db:b4/user-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_arm64/90:e2:ba:49:db:b4/user-data index 47c27c4820..d593e57899 100644 --- a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_arm64/90:e2:ba:49:db:b4/user-data +++ b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_arm64/90:e2:ba:49:db:b4/user-data @@ -76,7 +76,7 @@ autoinstall: =0YYh -----END PGP PUBLIC KEY BLOCK----- identity: - hostname: s73-t34-sut2 + hostname: s72-t34-sut1 password: $6$Y62lhMGJD8YNzmJn$H4DSqjrwFp5WN3tOvIrF.g/G2duOV76zXHAmaA/RU8jfT8H8sDumLQe/Q.EmI5pjPv7dzgI8j9BQPWes7efBK0 realname: testuser username: testuser @@ -90,7 +90,7 @@ autoinstall: network: ethernets: enp1s0f0: - addresses: [ 10.30.51.73/24 ] + addresses: [ 10.30.51.72/24 ] dhcp4: false gateway4: 10.30.51.1 nameservers: diff --git a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_arm64/90:e2:ba:55:be:32/user-data b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_arm64/90:e2:ba:55:be:32/user-data index d593e57899..47c27c4820 100644 --- a/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_arm64/90:e2:ba:55:be:32/user-data +++ b/fdio.infra/pxe/docker-nginx/html/ubuntu_noble_arm64/90:e2:ba:55:be:32/user-data @@ -76,7 +76,7 @@ autoinstall: =0YYh -----END PGP PUBLIC KEY BLOCK----- identity: - hostname: s72-t34-sut1 + hostname: s73-t34-sut2 password: $6$Y62lhMGJD8YNzmJn$H4DSqjrwFp5WN3tOvIrF.g/G2duOV76zXHAmaA/RU8jfT8H8sDumLQe/Q.EmI5pjPv7dzgI8j9BQPWes7efBK0 realname: testuser username: testuser @@ -90,7 +90,7 @@ autoinstall: network: ethernets: enp1s0f0: - addresses: [ 10.30.51.72/24 ] + addresses: [ 10.30.51.73/24 ] dhcp4: false gateway4: 10.30.51.1 nameservers: diff --git a/topologies/available/lf_3n_alt_testbed34.yaml b/topologies/available/lf_3n_alt_testbed34.yaml index 4028dbb2e6..e83f0d7d42 100644 --- a/topologies/available/lf_3n_alt_testbed34.yaml +++ b/topologies/available/lf_3n_alt_testbed34.yaml @@ -38,25 +38,25 @@ nodes: host: 10.30.51.72 arch: aarch64 port: 22 - uio_driver: vfio-pci username: testuser + uio_driver: vfio-pci password: Csit1234 interfaces: port3: - # s62-t34-sut1-c8/p1 - 100GE port1 Mellanox ConnectX-6 Dx 2p100GE. - mac_address: "b8:3f:d2:16:07:b8" + # s72-t34-sut1-c8/p1 - 100GE port1 Mellanox ConnectX-6 Dx 2p100GE. + mac_address: "b8:3f:d2:16:07:c4" pci_address: "0007:01:00.0" - ip4_address: 172.16.30.1 + ip4_address: 172.16.30.3 driver: mlx5_core - link: link6 + link: link5 model: Mellanox-CX6DX port4: - # s62-t34-sut1-c8/p2 - 100GE port2 Mellanox ConnectX-6 Dx 2p100GE. - mac_address: "b8:3f:d2:16:07:b9" + # s72-t34-sut1-c8/p2 - 100GE port2 Mellanox ConnectX-6 Dx 2p100GE. + mac_address: "b8:3f:d2:16:07:c5" pci_address: "0007:01:00.1" - ip4_address: 172.16.40.1 + ip4_address: 172.16.40.3 driver: mlx5_core - link: link4 + link: link6 model: Mellanox-CX6DX DUT2: type: DUT @@ -64,23 +64,23 @@ nodes: host: 10.30.51.73 arch: aarch64 port: 22 - username: testuser uio_driver: vfio-pci + username: testuser password: Csit1234 interfaces: port3: - # s63-t34-sut2-c8/p1 - 100GE port1 Mellanox ConnectX-6 Dx 2p100GE. - mac_address: "b8:3f:d2:16:07:c4" + # s73-t34-sut2-c8/p1 - 100GE port1 Mellanox ConnectX-6 Dx 2p100GE. + mac_address: "b8:3f:d2:16:07:b8" pci_address: "0007:01:00.0" - ip4_address: 172.16.30.3 + ip4_address: 172.16.30.1 driver: mlx5_core - link: link5 + link: link6 model: Mellanox-CX6DX port4: - # s63-t34-sut2-c8/p2 - 100GE port2 Mellanox ConnectX-6 Dx 2p100GE. - mac_address: "b8:3f:d2:16:07:c5" + # s73-t34-sut2-c8/p2 - 100GE port2 Mellanox ConnectX-6 Dx 2p100GE. + mac_address: "b8:3f:d2:16:07:b9" pci_address: "0007:01:00.1" - ip4_address: 172.16.40.3 + ip4_address: 172.16.40.1 driver: mlx5_core - link: link6 + link: link4 model: Mellanox-CX6DX \ No newline at end of file -- 2.16.6