From 9bdcc0e3c1e449fe0836eb0335a4c9f7824fe09b Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Fri, 25 Oct 2019 15:16:46 +0200 Subject: [PATCH] New daily triggers New daily triggers defined based on requirements defined in https://gerrit.fd.io/r/c/csit/+/22341/34/resources/tools/presentation/doc/trending_test_groups.md Change-Id: I95bff10d9a2e29c712a33f7c043933244b712fd0 Signed-off-by: Jan Gelety --- resources/libraries/bash/function/common.sh | 6 ++ .../libraries/bash/function/mrr-daily-clx.txt | 64 +++++++++++++++++++++- .../libraries/bash/function/mrr-daily-dnv.txt | 53 +++++++++++++++--- .../libraries/bash/function/mrr-daily-hsw.txt | 50 ++++++++++++++++- .../libraries/bash/function/mrr-daily-skx.txt | 64 +++++++++++++++++++++- .../libraries/bash/function/mrr-daily-tsh.txt | 60 +++++++++++++++++++- 6 files changed, 285 insertions(+), 12 deletions(-) mode change 120000 => 100644 resources/libraries/bash/function/mrr-daily-clx.txt mode change 120000 => 100644 resources/libraries/bash/function/mrr-daily-hsw.txt mode change 120000 => 100644 resources/libraries/bash/function/mrr-daily-skx.txt mode change 120000 => 100644 resources/libraries/bash/function/mrr-daily-tsh.txt diff --git a/resources/libraries/bash/function/common.sh b/resources/libraries/bash/function/common.sh index b38cd52e5e..f9c9e2ea91 100644 --- a/resources/libraries/bash/function/common.sh +++ b/resources/libraries/bash/function/common.sh @@ -756,6 +756,12 @@ function select_tags () { *"3n-tsh"*) default_nic="nic_intel-x520-da2" ;; + *"3n-skx"* | *"2n-skx"* | *"2n-clx"*) + default_nic="nic_intel-xxv710" + ;; + *"3n-hsw"*) + default_nic="nic_intel-xl710" + ;; *) default_nic="nic_intel-x710" ;; diff --git a/resources/libraries/bash/function/mrr-daily-clx.txt b/resources/libraries/bash/function/mrr-daily-clx.txt deleted file mode 120000 index addc759369..0000000000 --- a/resources/libraries/bash/function/mrr-daily-clx.txt +++ /dev/null @@ -1 +0,0 @@ -mrr-daily.txt \ No newline at end of file diff --git a/resources/libraries/bash/function/mrr-daily-clx.txt b/resources/libraries/bash/function/mrr-daily-clx.txt new file mode 100644 index 0000000000..95697a7ed6 --- /dev/null +++ b/resources/libraries/bash/function/mrr-daily-clx.txt @@ -0,0 +1,63 @@ +!nf_density + +# container_memif +mrrAND${default_nic}ANDmemifANDbaseAND64b + +# crypto +# mrrAND${default_nic}ANDscaleANDipsecswAND64bNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000 +mrrAND${default_nic}ANDscaleANDipsecswANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000 + +# ip4 +mrrAND${default_nic}ANDip4fwdANDbaseAND64bNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1NOTdot1qNOTsrc_user_1 +mrrAND${default_nic}ANDip4fwdANDbaseAND64bANDdot1qAND2_node_*_link_topoNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1 +mrrAND${default_nic}ANDip4fwdANDbaseAND64bANDdot1qAND3_node_*_link_topoNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1NOTdrv_avf +mrrAND${default_nic}ANDip4fwdANDscaleAND64bNOTnat44NOTipsec +mrrAND${default_nic}ANDip4fwdANDacl50AND10k_flowsAND64b +mrrANDip4baseAND64bNOTdot1q +mrrANDip4baseAND64bANDdot1qNOTdrv_avf +mrrANDip4fwdANDscaleANDfib_2mAND64b + +# ip4_tunnels +mrrAND${default_nic}ANDvxlanAND64bNOTvxlan_10NOTvxlan_1kNOTvtsNOTvhost + +# ip6 +mrrAND${default_nic}ANDip6fwdANDbaseAND78b +mrrAND${default_nic}ANDip6fwdANDscaleAND78b +mrrANDip6baseAND78b +mrrANDip6fwdANDscaleANDfib_2mAND78b + +# ip6_tunnels + +# l2 +mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlanNOTdot1q +mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bANDdot1qAND2_node_*_link_topoNOTmemifNOTvhostNOTvxlan +mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bANDdot1qAND3_node_*_link_topoNOTmemifNOTvhostNOTvxlanNOTdrv_avf +mrrAND${default_nic}ANDl2xcfwdANDbaseAND64bNOTdot1adNOTmemifNOTvhostNOTvxlan +mrrAND${default_nic}ANDl2patchANDbaseAND64bNOTmemifNOTvhostNOTvxlan +mrrAND${default_nic}ANDl2bdmaclrnANDscaleAND64bNOTmemifNOTvhostNOTvxlan +mrrAND${default_nic}ANDl2bdmaclrnANDfeatureANDacl50AND10k_flowsAND64b +mrrANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlanNOTgbp +mrrANDl2xcfwdANDbaseANDdrv_avfAND64bNOTdot1qNOTdot1adNOTmemifNOTvhost +mrrANDl2patchANDbaseANDdrv_avfAND64bNOTdot1qNOTdot1adNOTmemifNOTvhost +mrrANDl2bdmaclrnANDscaleANDfib_1mAND64bNOTmemifNOTvhostNOTvxlan + +# srv6 +mrrAND${default_nic}ANDfeatureANDsrv6AND78b + +# vm_vhost +mrrAND${default_nic}ANDvhostAND64b +mrrANDvhostAND64bANDlbond + +# vts +mrrAND${default_nic}ANDvtsAND114b + +!ipsectun +!hmac_sha_256 +!aes_128_gcm +!tnl_40 +!tnl_400 +!tnl_5000 +!tnl_20000 +!tnl_40000 +!tnl_60000 +!scaleANDnat44 diff --git a/resources/libraries/bash/function/mrr-daily-dnv.txt b/resources/libraries/bash/function/mrr-daily-dnv.txt index 1afd9e7ee7..2dd4757464 100644 --- a/resources/libraries/bash/function/mrr-daily-dnv.txt +++ b/resources/libraries/bash/function/mrr-daily-dnv.txt @@ -1,8 +1,45 @@ -mrrAND64bANDip4baseNOTdot1q -mrrAND78bANDip6baseNOTdot1q -mrrAND64bANDl2bdbaseNOTdot1q -mrrAND64bANDl2xcbaseNOTdot1q -mrrAND64bANDl2patch -mrrAND64bANDvxlanNOTdot1qNOTscale -mrrAND64bANDipsechwNOTlispgpeNOTscale -mrrAND1518bANDipsechwNOTlispgpeNOTscale +!nf_density + +# container_memif +mrrAND${default_nic}ANDmemifANDbaseAND64b + +# crypto +# mrrAND${default_nic}ANDscaleANDipsecswAND64bNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000 +mrrAND${default_nic}ANDscaleANDipsecswANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000 + +# ip4 +mrrAND${default_nic}ANDip4fwdANDbaseAND64bNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1NOTdot1q +mrrAND${default_nic}ANDip4fwdANDbaseAND64bNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1ANDdot1qNOTdrv_avf +mrrAND${default_nic}ANDip4fwdANDscaleAND64bNOTnat44NOTipsec +mrrAND${default_nic}ANDip4fwdANDacl50AND10k_flowsAND64b +mrrANDip4baseAND64bNOTdot1q +mrrANDip4baseAND64bANDdot1qNOTdrv_avf +mrrANDip4fwdANDscaleANDfib_2mAND64b + +# ip4_tunnels +mrrAND${default_nic}ANDvxlanAND64bNOTvxlan_10NOTvxlan_1kNOTvtsNOTvhost + +# ip6 +mrrAND${default_nic}ANDip6fwdANDbaseAND78b +mrrAND${default_nic}ANDip6fwdANDscaleAND78b +mrrANDip6baseAND78b +mrrANDip6fwdANDscaleANDfib_2mAND78b + +# ip6_tunnels + +# l2 +mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlanNOTdot1q +mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlanANDdot1qNOTdrv_avf +mrrAND${default_nic}ANDl2xcfwdANDbaseAND64bNOTdot1adNOTmemifNOTvhostNOTvxlan +mrrAND${default_nic}ANDl2patchANDbaseAND64bNOTmemifNOTvhostNOTvxlan +mrrAND${default_nic}ANDl2bdmaclrnANDscaleAND64bNOTmemifNOTvhostNOTvxlan +mrrAND${default_nic}ANDl2bdmaclrnANDfeatureANDacl50AND10k_flowsAND64b +mrrANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlanNOTgbp +mrrANDl2xcfwdANDbaseANDdrv_avfAND64bNOTdot1qNOTdot1adNOTmemifNOTvhost +mrrANDl2bdmaclrnANDscaleANDfib_1mAND64bNOTmemifNOTvhostNOTvxlan + +# srv6 +mrrAND${default_nic}ANDfeatureANDsrv6AND78b + +# vm_vhost +mrrAND${default_nic}ANDvhostANDbaseAND64b diff --git a/resources/libraries/bash/function/mrr-daily-hsw.txt b/resources/libraries/bash/function/mrr-daily-hsw.txt deleted file mode 120000 index addc759369..0000000000 --- a/resources/libraries/bash/function/mrr-daily-hsw.txt +++ /dev/null @@ -1 +0,0 @@ -mrr-daily.txt \ No newline at end of file diff --git a/resources/libraries/bash/function/mrr-daily-hsw.txt b/resources/libraries/bash/function/mrr-daily-hsw.txt new file mode 100644 index 0000000000..0393e3c192 --- /dev/null +++ b/resources/libraries/bash/function/mrr-daily-hsw.txt @@ -0,0 +1,49 @@ +# container_memif + +# crypto +# mrrAND${default_nic}ANDscaleANDipsecswAND64bNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000 +# mrrAND${default_nic}ANDscaleANDipsechwANDtnl_1000AND64bNOTipsectunNOThmac_sha_256NOTaes_128_gcm +# mrrAND${default_nic}ANDbaseANDipsechwAND64bNOTipsectunNOThmac_sha_256NOTaes_128_gcm +mrrAND${default_nic}ANDscaleANDipsecswANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000 +mrrAND${default_nic}ANDscaleANDipsechwANDtnl_1000ANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcm +mrrAND${default_nic}ANDbaseANDipsechwANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcm + +# ip4 +mrrAND${default_nic}ANDip4fwdANDbaseAND64bNOTmemifNOTipsecNOTnat44NOTvhostNOTvxlan +mrrAND${default_nic}ANDip4fwdANDscaleANDfib_2mAND64bNOTnat44 + +# ip4_tunnels +mrrAND${default_nic}ANDvxlanAND64bNOTscaleNOTvhost + +# ip6 +mrrAND${default_nic}ANDip6fwdANDbaseAND78bNOTmemif +mrrAND${default_nic}ANDip6fwdANDscaleANDfib_2mAND78b + +# ip6_tunnels + +# l2 +mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlan +mrrAND${default_nic}ANDl2xcfwdANDbaseAND64bNOTdot1adNOTmemifNOTvhostNOTvxlan +mrrAND${default_nic}ANDl2patchANDbaseAND64bNOTmemifNOTvhostNOTvxlan +mrrAND${default_nic}ANDl2bdmaclrnANDscaleANDfib_1mAND64b + +# srv6 +mrrAND${default_nic}ANDfeatureANDsrv6AND78b + +# vm_vhost +mrrAND${default_nic}ANDvhostANDbaseAND64bNOTvxlanNOTlbondNOTdot1q +mrrAND${default_nic}ANDvhostANDl2bdmaclrnAND64bANDdot1qNOTlbondNOTvxlan + +# vts +mrrAND${default_nic}ANDvtsAND114b + +!ipsectun +!hmac_sha_256 +!aes_128_gcm +!tnl_40 +!tnl_400 +!tnl_5000 +!tnl_20000 +!tnl_40000 +!tnl_60000 +!scaleANDnat44 diff --git a/resources/libraries/bash/function/mrr-daily-skx.txt b/resources/libraries/bash/function/mrr-daily-skx.txt deleted file mode 120000 index addc759369..0000000000 --- a/resources/libraries/bash/function/mrr-daily-skx.txt +++ /dev/null @@ -1 +0,0 @@ -mrr-daily.txt \ No newline at end of file diff --git a/resources/libraries/bash/function/mrr-daily-skx.txt b/resources/libraries/bash/function/mrr-daily-skx.txt new file mode 100644 index 0000000000..95697a7ed6 --- /dev/null +++ b/resources/libraries/bash/function/mrr-daily-skx.txt @@ -0,0 +1,63 @@ +!nf_density + +# container_memif +mrrAND${default_nic}ANDmemifANDbaseAND64b + +# crypto +# mrrAND${default_nic}ANDscaleANDipsecswAND64bNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000 +mrrAND${default_nic}ANDscaleANDipsecswANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000 + +# ip4 +mrrAND${default_nic}ANDip4fwdANDbaseAND64bNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1NOTdot1qNOTsrc_user_1 +mrrAND${default_nic}ANDip4fwdANDbaseAND64bANDdot1qAND2_node_*_link_topoNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1 +mrrAND${default_nic}ANDip4fwdANDbaseAND64bANDdot1qAND3_node_*_link_topoNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1NOTdrv_avf +mrrAND${default_nic}ANDip4fwdANDscaleAND64bNOTnat44NOTipsec +mrrAND${default_nic}ANDip4fwdANDacl50AND10k_flowsAND64b +mrrANDip4baseAND64bNOTdot1q +mrrANDip4baseAND64bANDdot1qNOTdrv_avf +mrrANDip4fwdANDscaleANDfib_2mAND64b + +# ip4_tunnels +mrrAND${default_nic}ANDvxlanAND64bNOTvxlan_10NOTvxlan_1kNOTvtsNOTvhost + +# ip6 +mrrAND${default_nic}ANDip6fwdANDbaseAND78b +mrrAND${default_nic}ANDip6fwdANDscaleAND78b +mrrANDip6baseAND78b +mrrANDip6fwdANDscaleANDfib_2mAND78b + +# ip6_tunnels + +# l2 +mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlanNOTdot1q +mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bANDdot1qAND2_node_*_link_topoNOTmemifNOTvhostNOTvxlan +mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bANDdot1qAND3_node_*_link_topoNOTmemifNOTvhostNOTvxlanNOTdrv_avf +mrrAND${default_nic}ANDl2xcfwdANDbaseAND64bNOTdot1adNOTmemifNOTvhostNOTvxlan +mrrAND${default_nic}ANDl2patchANDbaseAND64bNOTmemifNOTvhostNOTvxlan +mrrAND${default_nic}ANDl2bdmaclrnANDscaleAND64bNOTmemifNOTvhostNOTvxlan +mrrAND${default_nic}ANDl2bdmaclrnANDfeatureANDacl50AND10k_flowsAND64b +mrrANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlanNOTgbp +mrrANDl2xcfwdANDbaseANDdrv_avfAND64bNOTdot1qNOTdot1adNOTmemifNOTvhost +mrrANDl2patchANDbaseANDdrv_avfAND64bNOTdot1qNOTdot1adNOTmemifNOTvhost +mrrANDl2bdmaclrnANDscaleANDfib_1mAND64bNOTmemifNOTvhostNOTvxlan + +# srv6 +mrrAND${default_nic}ANDfeatureANDsrv6AND78b + +# vm_vhost +mrrAND${default_nic}ANDvhostAND64b +mrrANDvhostAND64bANDlbond + +# vts +mrrAND${default_nic}ANDvtsAND114b + +!ipsectun +!hmac_sha_256 +!aes_128_gcm +!tnl_40 +!tnl_400 +!tnl_5000 +!tnl_20000 +!tnl_40000 +!tnl_60000 +!scaleANDnat44 diff --git a/resources/libraries/bash/function/mrr-daily-tsh.txt b/resources/libraries/bash/function/mrr-daily-tsh.txt deleted file mode 120000 index addc759369..0000000000 --- a/resources/libraries/bash/function/mrr-daily-tsh.txt +++ /dev/null @@ -1 +0,0 @@ -mrr-daily.txt \ No newline at end of file diff --git a/resources/libraries/bash/function/mrr-daily-tsh.txt b/resources/libraries/bash/function/mrr-daily-tsh.txt new file mode 100644 index 0000000000..37b4f3be33 --- /dev/null +++ b/resources/libraries/bash/function/mrr-daily-tsh.txt @@ -0,0 +1,59 @@ +# !nf_density + +# container_memif +mrrAND${default_nic}ANDmemifANDbaseAND64b + +# crypto +# mrrAND${default_nic}ANDscaleANDipsecswAND64bNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000 +mrrAND${default_nic}ANDscaleANDipsecswANDimixNOTipsectunNOThmac_sha_256NOTaes_128_gcmNOTtnl_40NOTtnl_400NOTtnl_5000NOTtnl_20000NOTtnl_40000NOTtnl_60000 + +# ip4 +mrrAND${default_nic}ANDip4fwdANDbaseAND64bNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1NOTdot1q +mrrAND${default_nic}ANDip4fwdANDbaseAND64bNOTipsecNOTmemifNOTvhostNOTvxlanNOTsrc_user_1ANDdot1qNOTdrv_avf +mrrAND${default_nic}ANDip4fwdANDscaleAND64bNOTnat44NOTipsec +mrrAND${default_nic}ANDip4fwdANDacl50AND10k_flowsAND64b +mrrANDip4baseAND64bNOTdot1q +mrrANDip4baseAND64bANDdot1qNOTdrv_avf +mrrANDip4fwdANDscaleANDfib_2mAND64b + +# ip4_tunnels +mrrAND${default_nic}ANDvxlanAND64bNOTvxlan_10NOTvxlan_1kNOTvtsNOTvhost + +# ip6 +mrrAND${default_nic}ANDip6fwdANDbaseAND78b +mrrAND${default_nic}ANDip6fwdANDscaleAND78b +mrrANDip6baseAND78b +mrrANDip6fwdANDscaleANDfib_2mAND78b + +# ip6_tunnels + +# l2 +mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlanNOTdot1q +mrrAND${default_nic}ANDl2bdmaclrnANDbaseAND64bANDdot1qNOTmemifNOTvhostNOTvxlanNOTdrv_avf +mrrAND${default_nic}ANDl2xcfwdANDbaseAND64bNOTdot1adNOTmemifNOTvhostNOTvxlan +mrrAND${default_nic}ANDl2patchANDbaseAND64bNOTmemifNOTvhostNOTvxlan +mrrAND${default_nic}ANDl2bdmaclrnANDscaleAND64bNOTmemifNOTvhostNOTvxlan +mrrAND${default_nic}ANDl2bdmaclrnANDfeatureANDacl50AND10k_flowsAND64b +mrrANDl2bdmaclrnANDbaseAND64bNOTmemifNOTvhostNOTvxlanNOTgbp +mrrANDl2bdmaclrnANDscaleANDfib_1mAND64bNOTmemifNOTvhostNOTvxlan + +# srv6 +mrrAND${default_nic}ANDfeatureANDsrv6AND78b + +# vm_vhost +mrrAND${default_nic}ANDvhostANDbaseAND64b + +# vts +mrrAND${default_nic}ANDvtsAND114b + +!ipsectun +!hmac_sha_256 +!aes_128_gcm +!tnl_40 +!tnl_400 +!tnl_5000 +!tnl_20000 +!tnl_40000 +!tnl_60000 +!scaleANDnat44 +!lbond -- 2.16.6