Code Review
/
csit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fix(core): SPR include
[csit.git]
/
resources
/
libraries
/
bash
/
function
/
common.sh
diff --git
a/resources/libraries/bash/function/common.sh
b/resources/libraries/bash/function/common.sh
index
a383063
..
afe9237
100644
(file)
--- a/
resources/libraries/bash/function/common.sh
+++ b/
resources/libraries/bash/function/common.sh
@@
-1,5
+1,5
@@
-# Copyright (c) 202
2
Cisco and/or its affiliates.
-# Copyright (c) 202
2
PANTHEON.tech and/or its affiliates.
+# Copyright (c) 202
3
Cisco and/or its affiliates.
+# Copyright (c) 202
3
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:
# 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:
@@
-467,10
+467,18
@@
function get_test_code () {
NODENESS="2n"
FLAVOR="icx"
;;
NODENESS="2n"
FLAVOR="icx"
;;
+ *"2n-spr"*)
+ NODENESS="2n"
+ FLAVOR="spr"
+ ;;
*"3n-icx"*)
NODENESS="3n"
FLAVOR="icx"
;;
*"3n-icx"*)
NODENESS="3n"
FLAVOR="icx"
;;
+ *"3n-spr"*)
+ NODENESS="3n"
+ FLAVOR="spr"
+ ;;
*"3n-snr"*)
NODENESS="3n"
FLAVOR="snr"
*"3n-snr"*)
NODENESS="3n"
FLAVOR="snr"
@@
-775,11
+783,6
@@
function select_arch_os () {
case "${ID}" in
"ubuntu"*)
case "${VERSION}" in
case "${ID}" in
"ubuntu"*)
case "${VERSION}" in
- *"LTS (Focal Fossa)"*)
- IMAGE_VER_FILE="VPP_DEVICE_IMAGE_UBUNTU"
- VPP_VER_FILE="VPP_STABLE_VER_UBUNTU_FOCAL"
- PKG_SUFFIX="deb"
- ;;
*"LTS (Jammy Jellyfish)"*)
IMAGE_VER_FILE="VPP_DEVICE_IMAGE_UBUNTU_JAMMY"
VPP_VER_FILE="VPP_STABLE_VER_UBUNTU_JAMMY"
*"LTS (Jammy Jellyfish)"*)
IMAGE_VER_FILE="VPP_DEVICE_IMAGE_UBUNTU_JAMMY"
VPP_VER_FILE="VPP_STABLE_VER_UBUNTU_JAMMY"
@@
-859,10
+862,13
@@
function select_tags () {
*"3n-icx"* | *"2n-icx"*)
default_nic="nic_intel-xxv710"
;;
*"3n-icx"* | *"2n-icx"*)
default_nic="nic_intel-xxv710"
;;
+ *"3n-spr"* | *"2n-spr"*)
+ default_nic="nic_intel-e810cq"
+ ;;
*"2n-clx"* | *"2n-zn2"*)
default_nic="nic_intel-xxv710"
;;
*"2n-clx"* | *"2n-zn2"*)
default_nic="nic_intel-xxv710"
;;
- *"2n-tx2"* | *"3n-alt"*
| *"mrr-daily-master"
)
+ *"2n-tx2"* | *"3n-alt"*)
default_nic="nic_intel-xl710"
;;
*"1n-aws"* | *"2n-aws"* | *"3n-aws"*)
default_nic="nic_intel-xl710"
;;
*"1n-aws"* | *"2n-aws"* | *"3n-aws"*)
@@
-886,6
+892,7
@@
function select_tags () {
awk_nics_sub_cmd+='gsub("nitro-50g","50ge1p1ENA");'
awk_nics_sub_cmd+='if ($9 =="drv_avf") drv="avf-";'
awk_nics_sub_cmd+='else if ($9 =="drv_rdma_core") drv ="rdma-";'
awk_nics_sub_cmd+='gsub("nitro-50g","50ge1p1ENA");'
awk_nics_sub_cmd+='if ($9 =="drv_avf") drv="avf-";'
awk_nics_sub_cmd+='else if ($9 =="drv_rdma_core") drv ="rdma-";'
+ awk_nics_sub_cmd+='else if ($9 =="drv_mlx5_core") drv ="mlx5-";'
awk_nics_sub_cmd+='else if ($9 =="drv_af_xdp") drv ="af-xdp-";'
awk_nics_sub_cmd+='else drv="";'
awk_nics_sub_cmd+='if ($1 =="-") cores="";'
awk_nics_sub_cmd+='else if ($9 =="drv_af_xdp") drv ="af-xdp-";'
awk_nics_sub_cmd+='else drv="";'
awk_nics_sub_cmd+='if ($1 =="-") cores="";'
@@
-902,9
+909,15
@@
function select_tags () {
awk {"$awk_nics_sub_cmd"} || echo "devicetest") || die
SELECTION_MODE="--test"
;;
awk {"$awk_nics_sub_cmd"} || echo "devicetest") || die
SELECTION_MODE="--test"
;;
+ *"hoststack-daily"* )
+ readarray -t test_tag_array <<< $(grep -v "#" \
+ ${tfd}/hoststack_daily/${DUT}-${NODENESS}-${FLAVOR}.md |
+ awk {"$awk_nics_sub_cmd"} || echo "perftest") || die
+ SELECTION_MODE="--test"
+ ;;
*"ndrpdr-weekly"* )
readarray -t test_tag_array <<< $(grep -v "#" \
*"ndrpdr-weekly"* )
readarray -t test_tag_array <<< $(grep -v "#" \
- ${tfd}/
ml
r_weekly/${DUT}-${NODENESS}-${FLAVOR}.md |
+ ${tfd}/
ndrpd
r_weekly/${DUT}-${NODENESS}-${FLAVOR}.md |
awk {"$awk_nics_sub_cmd"} || echo "perftest") || die
SELECTION_MODE="--test"
;;
awk {"$awk_nics_sub_cmd"} || echo "perftest") || die
SELECTION_MODE="--test"
;;
@@
-974,21
+987,28
@@
function select_tags () {
*"2n-icx"*)
test_tag_array+=("!ipsechw")
;;
*"2n-icx"*)
test_tag_array+=("!ipsechw")
;;
- *"3n-icx"*)
+ *"2n-spr"*)
+ test_tag_array+=("!ipsechw")
+ ;;
+ *"2n-tx2"*)
test_tag_array+=("!ipsechw")
test_tag_array+=("!ipsechw")
- # Not enough nic_intel-xxv710 to support double link tests.
- test_tag_array+=("!3_node_double_link_topoANDnic_intel-xxv710")
;;
*"2n-zn2"*)
test_tag_array+=("!ipsechw")
;;
;;
*"2n-zn2"*)
test_tag_array+=("!ipsechw")
;;
- *"
2n-tx2"* | *"
3n-alt"*)
+ *"3n-alt"*)
test_tag_array+=("!ipsechw")
;;
test_tag_array+=("!ipsechw")
;;
+ *"3n-icx"*)
+ test_tag_array+=("!ipsechw")
+ test_tag_array+=("!3_node_double_link_topoANDnic_intel-xxv710")
+ ;;
*"3n-snr"*)
;;
*"3n-snr"*)
;;
+ *"3n-spr"*)
+ test_tag_array+=("!ipsechw")
+ ;;
*"3n-tsh"*)
*"3n-tsh"*)
- # 3n-tsh only has x520 NICs which don't work with AVF
test_tag_array+=("!drv_avf")
test_tag_array+=("!ipsechw")
;;
test_tag_array+=("!drv_avf")
test_tag_array+=("!ipsechw")
;;
@@
-1091,6
+1111,10
@@
function select_topology () {
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_icx*.yaml )
TOPOLOGIES_TAGS="2_node_*_link_topo"
;;
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_icx*.yaml )
TOPOLOGIES_TAGS="2_node_*_link_topo"
;;
+ "2n_spr")
+ TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*2n_spr*.yaml )
+ TOPOLOGIES_TAGS="2_node_*_link_topo"
+ ;;
"3n_snr")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_snr*.yaml )
TOPOLOGIES_TAGS="3_node_single_link_topo"
"3n_snr")
TOPOLOGIES=( "${TOPOLOGIES_DIR}"/*3n_snr*.yaml )
TOPOLOGIES_TAGS="3_node_single_link_topo"