From 48fb6e37ed3c4b1ad7440eb5f29d83953ab42d75 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Juraj=20Linke=C5=A1?= Date: Sat, 13 May 2023 11:07:18 +0200 Subject: [PATCH] feat(infra): DPDK 23.03 arm update MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Update arm TGs to 23.03. Update 2n-tx2 and 3n-alt testbed info after NIC move. 3n-tsh doesn't use any i40e NIC -> remove the matrix. Change-Id: If61e95515eb2e21e9d50015901924e8e129b598a Signed-off-by: Juraj Linkeš --- .../inventories/lf_inventory/host_vars/10.30.51.36.yaml | 3 --- .../inventories/lf_inventory/host_vars/10.30.51.37.yaml | 3 --- .../inventories/lf_inventory/host_vars/10.30.51.49.yaml | 2 +- .../inventories/lf_inventory/host_vars/10.30.51.69.yaml | 2 +- .../inventories/lf_inventory/host_vars/10.30.51.74.yaml | 4 ++-- topologies/available/lf_2n_tx2_testbed34.yaml | 10 +++++----- topologies/available/lf_3n_alt_testbed34.yaml | 14 +++++++------- 7 files changed, 16 insertions(+), 22 deletions(-) diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml index 982737b874..1db367bd67 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.36.yaml @@ -21,6 +21,3 @@ sysctl: inventory_ipmi_hostname: "10.30.50.36" cpu_microarchitecture: "taishan" - -intel_700_matrix: "dpdk22.07" - diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml index ded425a18d..7d3188251a 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.37.yaml @@ -21,6 +21,3 @@ sysctl: inventory_ipmi_hostname: "10.30.50.37" cpu_microarchitecture: "taishan" - -intel_700_matrix: "dpdk22.07" - diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml index 3b9b63dfd0..d159ad640b 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.49.yaml @@ -30,4 +30,4 @@ inventory_ipmi_hostname: "10.30.50.46" cpu_microarchitecture: "skylake" docker_tg: true -intel_700_matrix: "dpdk22.07" +intel_700_matrix: "dpdk23.03" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml index f88ec8cfbf..7b219738f1 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.69.yaml @@ -37,4 +37,4 @@ users: - "ssh-rsa AAAAB3NzaC1yc2EAAAABJQAAAQEAgObJFDIMmPwQhhkjAynvlbwpM5yeSewyaE7vTLaFf4uFz4vmsE2hFf6B2xXHUGLVwoVfk91UeK7LOGrdDpoDDHzvPZXj5NmZI+WiWax5y2pQZNkcSZws0ENCeEc4hPwc4veJ1JmhokF4Bsmu14HyFMaFUhM8897jtJwsh+9fLA/no0iPGaQqEtRUQhkV+P4jCEPoY0qdRZAzVw/rY4EGAMhsJe3EJmyj63OfrrkG3+hvSLFo5pDxHQr3pZd/c6ukI7xMef48PosAvGCm3oxzb/Gu9PZIGuHLczY+tCnzCkY7MO7E+IWgjXrUAfYwSWz8XmFmA9LLe26DT5jkcK8hGQ== pmikus@cisco.com" - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCXUbbhesOpvPF+KI8nq4TXvEO/Un1aU/ehZ9clCyw9C40xjDkX2BlcX8WeHxFHe7fjFaCd07Vg73rn/3M9uNDnDxvjH1GQ0twvi3iBTO4PkHBBfGF9qnE8MYzno6FvlsVKLuUuPbfm8kbOQ+ZDfdXq6gdtXh0hSYYkqC1heNPCNsqaakkB99Edyle+Ot0V7cpW+Yo2wo98KuX/cgUEhVoA8QnNVE7zaWcjSXBZEteoA4gLpAbV6p67/d6H/2ykHTidBViYTEsHco56tJoA4nTPuAupDOLBcWXgF5TAN6z1aCn2JA1DDfniLakgrZ5oVj2qHhUmbxQAtnKQfHADjqzV jlinkes@jlinkes" -intel_700_matrix: "dpdk22.07" +intel_700_matrix: "dpdk23.03" diff --git a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.74.yaml b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.74.yaml index 473e4a9a5e..e27d9649dc 100644 --- a/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.74.yaml +++ b/fdio.infra.ansible/inventories/lf_inventory/host_vars/10.30.51.74.yaml @@ -29,5 +29,5 @@ sysctl: inventory_ipmi_hostname: "10.30.50.74" cpu_microarchitecture: "icelake" -intel_700_matrix: "dpdk22.07" -intel_800_matrix: "dpdk22.07" +intel_700_matrix: "dpdk23.03" +intel_800_matrix: "dpdk23.03" diff --git a/topologies/available/lf_2n_tx2_testbed34.yaml b/topologies/available/lf_2n_tx2_testbed34.yaml index 6c08aaf183..cbaefc387a 100644 --- a/topologies/available/lf_2n_tx2_testbed34.yaml +++ b/topologies/available/lf_2n_tx2_testbed34.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2020 PANTHEON.tech and/or its affiliates. +# Copyright (c) 2020-2023 PANTHEON.tech and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -30,13 +30,13 @@ nodes: password: Csit1234 interfaces: port0: - mac_address: "3c:fd:fe:c3:e0:90" + mac_address: "3c:fd:fe:c3:e9:70" pci_address: "0000:af:00.0" link: link1 driver: i40e model: Intel-XL710 port1: - mac_address: "3c:fd:fe:c3:e0:91" + mac_address: "3c:fd:fe:c3:e9:71" pci_address: "0000:af:00.1" link: link2 driver: i40e @@ -51,13 +51,13 @@ nodes: password: Csit1234 interfaces: port0: - mac_address: "3c:fd:fe:c3:e9:70" + mac_address: "3c:fd:fe:c3:e0:90" pci_address: "0000:91:00.0" link: link1 driver: i40e model: Intel-XL710 port1: - mac_address: "3c:fd:fe:c3:e9:71" + mac_address: "3c:fd:fe:c3:e0:91" pci_address: "0000:91:00.1" link: link2 driver: i40e diff --git a/topologies/available/lf_3n_alt_testbed34.yaml b/topologies/available/lf_3n_alt_testbed34.yaml index 1505e9db60..4334304614 100644 --- a/topologies/available/lf_3n_alt_testbed34.yaml +++ b/topologies/available/lf_3n_alt_testbed34.yaml @@ -1,4 +1,4 @@ -# Copyright (c) 2022 PANTHEON.tech and/or its affiliates. +# Copyright (c) 2022-2023 PANTHEON.tech and/or its affiliates. # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. # You may obtain a copy of the License at: @@ -30,13 +30,13 @@ nodes: password: Csit1234 interfaces: port0: - mac_address: "3c:fd:fe:c3:e7:a0" + mac_address: "40:a6:b7:85:e7:80" pci_address: "0000:31:00.0" link: link1 driver: i40e model: Intel-XL710 port1: - mac_address: "3c:fd:fe:c3:e7:a1" + mac_address: "40:a6:b7:85:e7:81" pci_address: "0000:31:00.1" link: link2 driver: i40e @@ -51,13 +51,13 @@ nodes: password: Csit1234 interfaces: port0: - mac_address: "40:a6:b7:85:e7:80" + mac_address: "40:a6:b7:85:e7:78" pci_address: "0004:04:00.0" link: link3 driver: i40e model: Intel-XL710 port1: - mac_address: "40:a6:b7:85:e7:81" + mac_address: "40:a6:b7:85:e7:79" pci_address: "0004:04:00.1" link: link2 driver: i40e @@ -72,13 +72,13 @@ nodes: password: Csit1234 interfaces: port0: - mac_address: "40:a6:b7:85:e7:78" + mac_address: "3c:fd:fe:c3:e7:a0" pci_address: "0004:04:00.0" link: link1 driver: i40e model: Intel-XL710 port1: - mac_address: "40:a6:b7:85:e7:79" + mac_address: "3c:fd:fe:c3:e7:a1" pci_address: "0004:04:00.1" link: link3 driver: i40e -- 2.16.6