diff options
3 files changed, 12 insertions, 8 deletions
diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index aa84201722..e1bf88db9d 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -962,6 +962,10 @@ function select_topology () { TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_skx*.yaml ) TOPOLOGIES_TAGS="2_node_*_link_topo" ;; + "2n_zn2") + TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_zn2*.yaml ) + TOPOLOGIES_TAGS="2_node_*_link_topo" + ;; "3n_skx") TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_skx*.yaml ) TOPOLOGIES_TAGS="3_node_*_link_topo" diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml index 916fb4f3c2..2296e3db00 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.24.yaml @@ -3,12 +3,12 @@ hostname: "s60-t210-sut1" grub: - isolcpus: "1-63" - nohz_full: "1-63" - rcu_nocbs: "1-63" + isolcpus: "0-15,17-31,33-47,49-63" + nohz_full: "0-15,17-31,33-47,49-63" + rcu_nocbs: "0-15,17-31,33-47,49-63" sysctl: kernel: - watchdog_cpumask: "0" + watchdog_cpumask: "0,16,32,48" vm: nr_hugepages: 8192 max_map_count: 20000 diff --git a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml index 586182509a..441f922d4e 100644 --- a/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml +++ b/resources/tools/testbed-setup/ansible/inventories/lf_inventory/host_vars/10.32.8.25.yaml @@ -3,12 +3,12 @@ hostname: "s61-t210-tg1" grub: - isolcpus: "1-63" - nohz_full: "1-63" - rcu_nocbs: "1-63" + isolcpus: "0-15,17-31,33-47,49-63" + nohz_full: "0-15,17-31,33-47,49-63" + rcu_nocbs: "0-15,17-31,33-47,49-63" sysctl: kernel: - watchdog_cpumask: "0" + watchdog_cpumask: "0,16,32,48" vm: nr_hugepages: 8192 max_map_count: 20000 |