From: Tibor Frank Date: Thu, 11 Jun 2020 10:17:41 +0000 (+0200) Subject: Update selection of report-iterative test sets X-Git-Url: https://gerrit.fd.io/r/gitweb?p=csit.git;a=commitdiff_plain;h=806a069bc5494d1c43dd9711e1512e518c823acd Update selection of report-iterative test sets - Create the same directory structure for report-iterative as it is for report-coverage. - Move files from report-iterative directory to created sub-directories. - Rename the moved files to keep the convention defined in report-coverage. - Update the corresponding functionality in resources/libraries/bash/function/common.sh The patches: - https://gerrit.fd.io/r/c/csit/+/27486 - https://gerrit.fd.io/r/c/csit/+/27484 - https://gerrit.fd.io/r/c/csit/+/27485 must be updated. Change-Id: I1aaf22690e3df5abf56893bb1d2d380debc54ddd Signed-off-by: Tibor Frank --- diff --git a/docs/job_specs/report_iterative/dpdk-2n-clx.md b/docs/job_specs/report_iterative/2n-clx/dpdk-00.md similarity index 100% rename from docs/job_specs/report_iterative/dpdk-2n-clx.md rename to docs/job_specs/report_iterative/2n-clx/dpdk-00.md diff --git a/docs/job_specs/report_iterative/2n-clx/reconf-00.md b/docs/job_specs/report_iterative/2n-clx/reconf-00.md new file mode 100644 index 0000000000..ce723ed735 --- /dev/null +++ b/docs/job_specs/report_iterative/2n-clx/reconf-00.md @@ -0,0 +1,37 @@ + +# 2n-clx +## ./container_memif +## ./crypto +## ./ip4 +## ./ip4_tunnels +## ./ip6 +## ./ip6_tunnels +## ./l2 +## ./lb +## ./nfv_density/dcr_memif/chain +## ./nfv_density/dcr_memif/chain_ipsec +## ./nfv_density/dcr_memif/pipeline +## ./nfv_density/vm_vhost/chain +## ./nfv_density/vm_vhost/chain_dot1qip4vxlan +### intel-xxv710 +#### avf +##### dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd +1c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd +2c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd +4c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd +##### dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd +1c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd +2c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd +4c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd +##### dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd +1c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd +2c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd +4c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd +##### dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd +1c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd +2c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd +4c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd +## ./srv6 +## ./tcp +## ./vm_vhost +## ./vts diff --git a/docs/job_specs/report_iterative/2n-clx/soak-00.md b/docs/job_specs/report_iterative/2n-clx/soak-00.md new file mode 100644 index 0000000000..05775ce2ad --- /dev/null +++ b/docs/job_specs/report_iterative/2n-clx/soak-00.md @@ -0,0 +1,59 @@ + +# 2n-clx +## ./container_memif +### intel-xxv710 +#### avf +##### eth-l2bdbasemaclrn-eth-2memif-1dcr +1c AND 64b AND soak AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2memif-1dcr +#### dpdk-vfio-pci +##### eth-l2bdbasemaclrn-eth-2memif-1dcr +1c AND 64b AND soak AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2memif-1dcr +## ./crypto +## ./ip4 +### intel-xxv710 +#### avf +##### ethip4-ip4base +1c AND 64b AND soak AND xxv710 AND drv_avf AND ethip4-ip4base +#### dpdk-vfio-pci +##### ethip4-ip4base +1c AND 64b AND soak AND xxv710 AND drv_vfio_pci AND ethip4-ip4base +## ./ip4_tunnels +## ./ip6 +#### avf +##### ethip6-ip6base +1c AND 78b AND soak AND xxv710 AND drv_avf AND ethip6-ip6base +#### dpdk-vfio-pci +##### ethip6-ip6base +1c AND 78b AND soak AND xxv710 AND drv_vfio_pci AND ethip6-ip6base +## ./ip6_tunnels +## ./l2 +#### avf +##### eth-l2xcbase +1c AND 64b AND soak AND xxv710 AND drv_avf AND eth-l2xcbase +##### eth-l2bdbasemaclrn +1c AND 64b AND soak AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn +#### dpdk-vfio-pci +##### eth-l2xcbase +1c AND 64b AND soak AND xxv710 AND drv_vfio_pci AND eth-l2xcbase +##### eth-l2bdbasemaclrn +1c AND 64b AND soak AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn +## ./lb +## ./nfv_density/dcr_memif/chain +## ./nfv_density/dcr_memif/chain_ipsec +## ./nfv_density/dcr_memif/pipeline +## ./nfv_density/vm_vhost/chain +## ./nfv_density/vm_vhost/chain_dot1qip4vxlan +## ./srv6 +## ./tcp +## ./vm_vhost +#### avf +##### eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm +1c AND 64b AND soak AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm +##### eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc +1c AND 64b AND soak AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc +# #### dpdk-vfio-pci +# ##### eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm +# 1c AND 64b AND soak AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm +# ##### eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc +# 1c AND 64b AND soak AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc +## ./vts diff --git a/docs/job_specs/report_iterative/vpp-2n-clx.md b/docs/job_specs/report_iterative/2n-clx/vpp-00.md similarity index 100% rename from docs/job_specs/report_iterative/vpp-2n-clx.md rename to docs/job_specs/report_iterative/2n-clx/vpp-00.md diff --git a/docs/job_specs/report_iterative/dpdk-2n-dnv.md b/docs/job_specs/report_iterative/2n-dnv/dpdk-00.md similarity index 100% rename from docs/job_specs/report_iterative/dpdk-2n-dnv.md rename to docs/job_specs/report_iterative/2n-dnv/dpdk-00.md diff --git a/docs/job_specs/report_iterative/vpp-2n-dnv.md b/docs/job_specs/report_iterative/2n-dnv/vpp-00.md similarity index 100% rename from docs/job_specs/report_iterative/vpp-2n-dnv.md rename to docs/job_specs/report_iterative/2n-dnv/vpp-00.md diff --git a/docs/job_specs/report_iterative/dpdk-2n-skx.md b/docs/job_specs/report_iterative/2n-skx/dpdk-00.md similarity index 100% rename from docs/job_specs/report_iterative/dpdk-2n-skx.md rename to docs/job_specs/report_iterative/2n-skx/dpdk-00.md diff --git a/docs/job_specs/report_iterative/2n-skx/reconf-00.md b/docs/job_specs/report_iterative/2n-skx/reconf-00.md new file mode 100644 index 0000000000..b16405f9f7 --- /dev/null +++ b/docs/job_specs/report_iterative/2n-skx/reconf-00.md @@ -0,0 +1,45 @@ + +# 2n-skx +## ./container_memif +## ./crypto +## ./ip4 +## ./ip4_tunnels +## ./ip6 +## ./ip6_tunnels +## ./l2 +## ./lb +## ./nfv_density/dcr_memif/chain +## ./nfv_density/dcr_memif/chain_ipsec +## ./nfv_density/dcr_memif/pipeline +## ./nfv_density/vm_vhost/chain +## ./nfv_density/vm_vhost/chain_dot1qip4vxlan +### intel-xxv710 +#### avf +##### dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd +1c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd +2c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd +4c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-1ch-1ach-2vh-1vm1t-testpmd +##### dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd +1c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd +2c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd +4c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-2ch-1ach-4vh-2vm1t-testpmd +##### dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd +1c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd +2c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd +4c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-4ch-1ach-8vh-4vm1t-testpmd +##### dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd +1c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd +2c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd +4c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-6ch-1ach-12vh-6vm1t-testpmd +##### dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd +1c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd +2c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd +4c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-8ch-1ach-16vh-8vm1t-testpmd +##### dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd +1c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd +2c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd +4c AND imix AND reconf AND xxv710 AND drv_avf AND dot1qip4vxlan-l2bd-10ch-1ach-20vh-10vm1t-testpmd +## ./srv6 +## ./tcp +## ./vm_vhost +## ./vts diff --git a/docs/job_specs/report_iterative/2n-skx/soak-00.md b/docs/job_specs/report_iterative/2n-skx/soak-00.md new file mode 100644 index 0000000000..05775ce2ad --- /dev/null +++ b/docs/job_specs/report_iterative/2n-skx/soak-00.md @@ -0,0 +1,59 @@ + +# 2n-clx +## ./container_memif +### intel-xxv710 +#### avf +##### eth-l2bdbasemaclrn-eth-2memif-1dcr +1c AND 64b AND soak AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2memif-1dcr +#### dpdk-vfio-pci +##### eth-l2bdbasemaclrn-eth-2memif-1dcr +1c AND 64b AND soak AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2memif-1dcr +## ./crypto +## ./ip4 +### intel-xxv710 +#### avf +##### ethip4-ip4base +1c AND 64b AND soak AND xxv710 AND drv_avf AND ethip4-ip4base +#### dpdk-vfio-pci +##### ethip4-ip4base +1c AND 64b AND soak AND xxv710 AND drv_vfio_pci AND ethip4-ip4base +## ./ip4_tunnels +## ./ip6 +#### avf +##### ethip6-ip6base +1c AND 78b AND soak AND xxv710 AND drv_avf AND ethip6-ip6base +#### dpdk-vfio-pci +##### ethip6-ip6base +1c AND 78b AND soak AND xxv710 AND drv_vfio_pci AND ethip6-ip6base +## ./ip6_tunnels +## ./l2 +#### avf +##### eth-l2xcbase +1c AND 64b AND soak AND xxv710 AND drv_avf AND eth-l2xcbase +##### eth-l2bdbasemaclrn +1c AND 64b AND soak AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn +#### dpdk-vfio-pci +##### eth-l2xcbase +1c AND 64b AND soak AND xxv710 AND drv_vfio_pci AND eth-l2xcbase +##### eth-l2bdbasemaclrn +1c AND 64b AND soak AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn +## ./lb +## ./nfv_density/dcr_memif/chain +## ./nfv_density/dcr_memif/chain_ipsec +## ./nfv_density/dcr_memif/pipeline +## ./nfv_density/vm_vhost/chain +## ./nfv_density/vm_vhost/chain_dot1qip4vxlan +## ./srv6 +## ./tcp +## ./vm_vhost +#### avf +##### eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm +1c AND 64b AND soak AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm +##### eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc +1c AND 64b AND soak AND xxv710 AND drv_avf AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc +# #### dpdk-vfio-pci +# ##### eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm +# 1c AND 64b AND soak AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm +# ##### eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc +# 1c AND 64b AND soak AND xxv710 AND drv_vfio_pci AND eth-l2bdbasemaclrn-eth-2vhostvr1024-1vm-vppl2xc +## ./vts diff --git a/docs/job_specs/report_iterative/vpp-2n-skx.md b/docs/job_specs/report_iterative/2n-skx/vpp-00.md similarity index 100% rename from docs/job_specs/report_iterative/vpp-2n-skx.md rename to docs/job_specs/report_iterative/2n-skx/vpp-00.md diff --git a/docs/job_specs/report_iterative/dpdk-3n-dnv.md b/docs/job_specs/report_iterative/3n-dnv/dpdk-00.md similarity index 100% rename from docs/job_specs/report_iterative/dpdk-3n-dnv.md rename to docs/job_specs/report_iterative/3n-dnv/dpdk-00.md diff --git a/docs/job_specs/report_iterative/vpp-3n-dnv.md b/docs/job_specs/report_iterative/3n-dnv/vpp-00.md similarity index 100% rename from docs/job_specs/report_iterative/vpp-3n-dnv.md rename to docs/job_specs/report_iterative/3n-dnv/vpp-00.md diff --git a/docs/job_specs/report_iterative/dpdk-3n-hsw.md b/docs/job_specs/report_iterative/3n-hsw/dpdk-00.md similarity index 100% rename from docs/job_specs/report_iterative/dpdk-3n-hsw.md rename to docs/job_specs/report_iterative/3n-hsw/dpdk-00.md diff --git a/docs/job_specs/report_iterative/vpp-3n-hsw.md b/docs/job_specs/report_iterative/3n-hsw/vpp-00.md similarity index 100% rename from docs/job_specs/report_iterative/vpp-3n-hsw.md rename to docs/job_specs/report_iterative/3n-hsw/vpp-00.md diff --git a/docs/job_specs/report_iterative/dpdk-3n-skx.md b/docs/job_specs/report_iterative/3n-skx/dpdk-00.md similarity index 100% rename from docs/job_specs/report_iterative/dpdk-3n-skx.md rename to docs/job_specs/report_iterative/3n-skx/dpdk-00.md diff --git a/docs/job_specs/report_iterative/vpp-3n-skx.md b/docs/job_specs/report_iterative/3n-skx/vpp-00.md similarity index 100% rename from docs/job_specs/report_iterative/vpp-3n-skx.md rename to docs/job_specs/report_iterative/3n-skx/vpp-00.md diff --git a/docs/job_specs/report_iterative/dpdk-3n-tsh.md b/docs/job_specs/report_iterative/3n-tsh/dpdk-00.md similarity index 100% rename from docs/job_specs/report_iterative/dpdk-3n-tsh.md rename to docs/job_specs/report_iterative/3n-tsh/dpdk-00.md diff --git a/docs/job_specs/report_iterative/vpp-3n-tsh.md b/docs/job_specs/report_iterative/3n-tsh/vpp-00.md similarity index 100% rename from docs/job_specs/report_iterative/vpp-3n-tsh.md rename to docs/job_specs/report_iterative/3n-tsh/vpp-00.md diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index 3d59506e50..ec335f171f 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -784,8 +784,11 @@ function select_tags () { eval ${sed_nics_sub_cmd}) || die ;; *"report-iterative"* ) + test_sets=(${TEST_TAG_STRING//:/ }) + # Run only one test set per run + report_file=${test_sets[0]}.md readarray -t test_tag_array <<< $(sed 's/ //g' \ - ${tfd}/report_iterative/${DUT}-${NODENESS}-${FLAVOR}.md | + ${tfd}/report_iterative/${NODENESS}-${FLAVOR}/${report_file} | eval ${sed_nics_sub_cmd}) || die ;; *"report-coverage"* )