From 666571f429a457e6c3bddc0fa1ea0d7d65a76157 Mon Sep 17 00:00:00 2001 From: pmikus Date: Thu, 9 Feb 2023 07:33:19 +0000 Subject: feat(infra): Introduce 2n-spr 3n-spr Signed-off-by: pmikus Change-Id: Ied301e8fcca22af8420364f2e158dfdd49bdc58d (cherry picked from commit 830b1021b8173461e231b276b4323a0a631036fb) --- docs/job_specs/hoststack_daily/vpp-2n-spr.md | 1 + docs/job_specs/hoststack_daily/vpp-3n-spr.md | 1 + docs/job_specs/mrr_daily/vpp-2n-spr.md | 1 + docs/job_specs/mrr_daily/vpp-3n-spr.md | 1 + docs/job_specs/mrr_weekly/dpdk-2n-spr.md | 1 + docs/job_specs/mrr_weekly/dpdk-3n-spr.md | 1 + docs/job_specs/ndrpdr_weekly/vpp-2n-spr.md | 1 + docs/job_specs/ndrpdr_weekly/vpp-3n-spr.md | 1 + resources/libraries/bash/function/common.sh | 30 ++++++++++++++++++++++------ 9 files changed, 32 insertions(+), 6 deletions(-) create mode 120000 docs/job_specs/hoststack_daily/vpp-2n-spr.md create mode 120000 docs/job_specs/hoststack_daily/vpp-3n-spr.md create mode 120000 docs/job_specs/mrr_daily/vpp-2n-spr.md create mode 120000 docs/job_specs/mrr_daily/vpp-3n-spr.md create mode 120000 docs/job_specs/mrr_weekly/dpdk-2n-spr.md create mode 120000 docs/job_specs/mrr_weekly/dpdk-3n-spr.md create mode 120000 docs/job_specs/ndrpdr_weekly/vpp-2n-spr.md create mode 120000 docs/job_specs/ndrpdr_weekly/vpp-3n-spr.md diff --git a/docs/job_specs/hoststack_daily/vpp-2n-spr.md b/docs/job_specs/hoststack_daily/vpp-2n-spr.md new file mode 120000 index 0000000000..3f4cc69a30 --- /dev/null +++ b/docs/job_specs/hoststack_daily/vpp-2n-spr.md @@ -0,0 +1 @@ +../report_iterative/2n-spr/vpp-hoststack-00.md \ No newline at end of file diff --git a/docs/job_specs/hoststack_daily/vpp-3n-spr.md b/docs/job_specs/hoststack_daily/vpp-3n-spr.md new file mode 120000 index 0000000000..46891ac261 --- /dev/null +++ b/docs/job_specs/hoststack_daily/vpp-3n-spr.md @@ -0,0 +1 @@ +../report_iterative/3n-spr/vpp-hoststack-00.md \ No newline at end of file diff --git a/docs/job_specs/mrr_daily/vpp-2n-spr.md b/docs/job_specs/mrr_daily/vpp-2n-spr.md new file mode 120000 index 0000000000..cc3073457d --- /dev/null +++ b/docs/job_specs/mrr_daily/vpp-2n-spr.md @@ -0,0 +1 @@ +../report_iterative/2n-spr/vpp-mrr-00.md \ No newline at end of file diff --git a/docs/job_specs/mrr_daily/vpp-3n-spr.md b/docs/job_specs/mrr_daily/vpp-3n-spr.md new file mode 120000 index 0000000000..dda213fb0f --- /dev/null +++ b/docs/job_specs/mrr_daily/vpp-3n-spr.md @@ -0,0 +1 @@ +../report_iterative/3n-spr/vpp-mrr-00.md \ No newline at end of file diff --git a/docs/job_specs/mrr_weekly/dpdk-2n-spr.md b/docs/job_specs/mrr_weekly/dpdk-2n-spr.md new file mode 120000 index 0000000000..b2831b40b9 --- /dev/null +++ b/docs/job_specs/mrr_weekly/dpdk-2n-spr.md @@ -0,0 +1 @@ +../report_iterative/2n-spr/dpdk-mrr-00.md \ No newline at end of file diff --git a/docs/job_specs/mrr_weekly/dpdk-3n-spr.md b/docs/job_specs/mrr_weekly/dpdk-3n-spr.md new file mode 120000 index 0000000000..18866fe843 --- /dev/null +++ b/docs/job_specs/mrr_weekly/dpdk-3n-spr.md @@ -0,0 +1 @@ +../report_iterative/3n-spr/dpdk-mrr-00.md \ No newline at end of file diff --git a/docs/job_specs/ndrpdr_weekly/vpp-2n-spr.md b/docs/job_specs/ndrpdr_weekly/vpp-2n-spr.md new file mode 120000 index 0000000000..d3e8994d51 --- /dev/null +++ b/docs/job_specs/ndrpdr_weekly/vpp-2n-spr.md @@ -0,0 +1 @@ +../report_iterative/2n-spr/vpp-ndrpdr-00.md \ No newline at end of file diff --git a/docs/job_specs/ndrpdr_weekly/vpp-3n-spr.md b/docs/job_specs/ndrpdr_weekly/vpp-3n-spr.md new file mode 120000 index 0000000000..b87bbff24c --- /dev/null +++ b/docs/job_specs/ndrpdr_weekly/vpp-3n-spr.md @@ -0,0 +1 @@ +../report_iterative/3n-spr/vpp-ndrpdr-00.md \ No newline at end of file diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index 3c5533b209..4a5f43b3e1 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -467,10 +467,18 @@ function get_test_code () { NODENESS="2n" FLAVOR="icx" ;; + *"2n-spr"*) + NODENESS="2n" + FLAVOR="spr" + ;; *"3n-icx"*) NODENESS="3n" FLAVOR="icx" ;; + *"3n-spr"*) + NODENESS="3n" + FLAVOR="spr" + ;; *"3n-snr"*) NODENESS="3n" FLAVOR="snr" @@ -854,10 +862,13 @@ function select_tags () { *"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-tx2"* | *"3n-alt"* | *"mrr-daily-master") + *"2n-tx2"* | *"3n-alt"*) default_nic="nic_intel-xl710" ;; *"1n-aws"* | *"2n-aws"* | *"3n-aws"*) @@ -976,21 +987,28 @@ function select_tags () { *"2n-icx"*) test_tag_array+=("!ipsechw") ;; - *"3n-icx"*) + *"2n-spr"*) + test_tag_array+=("!ipsechw") + ;; + *"2n-tx2"*) 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-tx2"* | *"3n-alt"*) + *"3n-alt"*) test_tag_array+=("!ipsechw") ;; + *"3n-icx"*) + test_tag_array+=("!ipsechw") + test_tag_array+=("!3_node_double_link_topoANDnic_intel-xxv710") + ;; *"3n-snr"*) ;; + *"3n-spr"*) + test_tag_array+=("!ipsechw") + ;; *"3n-tsh"*) - # 3n-tsh only has x520 NICs which don't work with AVF test_tag_array+=("!drv_avf") test_tag_array+=("!ipsechw") ;; -- cgit 1.2.3-korg