From 5dc134628f7eef7fd609625c2ed291199ee6420f Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Wed, 28 Nov 2018 09:58:02 +0100 Subject: [PATCH] FIX: Exclude softwire func tests from execution CSIT-1371 Map commands were remove from VAT by patch https://gerrit.fd.io/r/#/c/16115/. Excluding softwire functional tests from execution until corresponding csit KWs are fixed. Change-Id: I2adc580fb4770746c355f12f5ce7e7f8823255d8 Signed-off-by: Jan Gelety --- bootstrap-vpp-verify-semiweekly.sh | 1 + bootstrap-vpp-verify-weekly.sh | 1 + bootstrap.sh | 2 ++ .../eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot | 2 +- .../eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot | 1 + .../eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot | 2 +- 6 files changed, 7 insertions(+), 2 deletions(-) diff --git a/bootstrap-vpp-verify-semiweekly.sh b/bootstrap-vpp-verify-semiweekly.sh index f8b6f348eb..509b4fb4fa 100644 --- a/bootstrap-vpp-verify-semiweekly.sh +++ b/bootstrap-vpp-verify-semiweekly.sh @@ -273,6 +273,7 @@ do --include vm_envAND3_node_single_link_topo \ --include vm_envAND3_node_double_link_topo \ --exclude PERFTEST \ + --exclude SOFTWIRE \ --noncritical EXPECTED_FAILING \ --output ${LOG_PATH}/output_func_test_set${test_set} \ tests/ diff --git a/bootstrap-vpp-verify-weekly.sh b/bootstrap-vpp-verify-weekly.sh index 6f5ae6fbe2..6974de2be5 100644 --- a/bootstrap-vpp-verify-weekly.sh +++ b/bootstrap-vpp-verify-weekly.sh @@ -225,6 +225,7 @@ do --include vm_envAND3_node_single_link_topo \ --include vm_envAND3_node_double_link_topo \ --exclude PERFTEST \ + --exclude SOFTWIRE \ --noncritical EXPECTED_FAILING \ --output ${LOG_PATH}/output_test_set${test_set} \ tests/ diff --git a/bootstrap.sh b/bootstrap.sh index 03d7effc46..2d26bccfad 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -318,6 +318,7 @@ function run_test_set() { --include vm_envAND3_node_single_link_topo \ --include vm_envAND3_node_double_link_topo \ --exclude PERFTEST \ + --exclude SOFTWIRE \ --exclude ${SKIP_PATCH} \ --noncritical EXPECTED_FAILING \ --output ${LOG_PATH}/log_test_set_run${nr} \ @@ -329,6 +330,7 @@ function run_test_set() { --include vm_envAND3_node_single_link_topo \ --include vm_envAND3_node_double_link_topo \ --exclude PERFTEST \ + --exclude SOFTWIRE \ --exclude ${SKIP_PATCH} \ --noncritical EXPECTED_FAILING \ --output ${LOG_PATH}/log_test_set_run${nr} \ diff --git a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot b/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot index 378accb922..c8c81f23bd 100644 --- a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot +++ b/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swirelw46-func.robot @@ -18,7 +18,7 @@ | Resource | resources/libraries/robot/ip/ip6.robot | Resource | resources/libraries/robot/ip/map.robot | Library | resources.libraries.python.Trace -| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO +| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SOFTWIRE | Test Setup | Set up functional test | Test Teardown | Tear down functional test | Documentation | *Lightweight 4 over 6 test cases* diff --git a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot b/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot index 95e61db654..04450d6148 100644 --- a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot +++ b/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremape-func.robot @@ -22,6 +22,7 @@ | Library | resources.libraries.python.Trace | Variables | resources/test_data/softwire/map_e_domains.py | ${5} | Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SKIP_VPP_PATCH +| ... | SOFTWIRE | Test Setup | Set up functional test | Test Teardown | Tear down functional test | Documentation | *Test for Basic mapping rule for MAP-E*\ diff --git a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot b/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot index 89ff28af38..981367e1b0 100644 --- a/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot +++ b/tests/vpp/func/ip4_tunnels/softwire/eth2p-ethip4--ethip6ip4-ip4base--ip6base-swiremapt-func.robot @@ -20,7 +20,7 @@ | Resource | resources/libraries/robot/ip/map.robot | Library | resources.libraries.python.IPUtil | Library | resources.libraries.python.Trace -| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO +| Force Tags | HW_ENV | VM_ENV | 3_NODE_DOUBLE_LINK_TOPO | SOFTWIRE | Test Setup | Run Keywords | Set up functional test | ... | AND | Set interfaces IP addresses and routes | Test Teardown | Tear down functional test -- 2.16.6