From 2a3181f49a0ae8790436b46621b9e77bcec632d1 Mon Sep 17 00:00:00 2001 From: Jan Gelety Date: Mon, 27 Jun 2016 11:07:46 +0200 Subject: [PATCH] CSIT-181: Remove fds tests from vpp-csit-verify and csit-vpp-verify jobs - add tag SKIP_PATCH to FDS related tests and exclude them from execution in case of vpp-csit-verify and csit-vpp-verify jobs Change-Id: I14237a78529b3d3c9b586041a24ceef303c1394b Signed-off-by: Jan Gelety --- bootstrap.sh | 1 + docs/tag_documentation.rst | 6 +++++- tests/suites/fds_related_tests/provider_network.robot | 2 +- tests/suites/fds_related_tests/tenant_network.robot | 2 +- 4 files changed, 8 insertions(+), 3 deletions(-) diff --git a/bootstrap.sh b/bootstrap.sh index fed5ff74f9..7c2611d6a3 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -206,5 +206,6 @@ PYTHONPATH=`pwd` pybot -L TRACE \ --include vm_envAND3_node_single_link_topo \ --include vm_envAND3_node_double_link_topo \ --exclude PERFTEST \ + --exclude SKIP_PATCH \ --noncritical EXPECTED_FAILING \ tests/ diff --git a/docs/tag_documentation.rst b/docs/tag_documentation.rst index 859972bb8b..1cb8147c7e 100644 --- a/docs/tag_documentation.rst +++ b/docs/tag_documentation.rst @@ -24,12 +24,16 @@ Topology TAGs the devices. 3_NODE_SINGLE_LINK_TOPO - 3 nodes connected in a circular topoloty with at least one link + 3 nodes connected in a circular topology with at least one link interconnecting devices. Objective TAGs -------------- +SKIP_PATCH + Test case(s) marked to not run in case of vpp-csit-verify (i.e. VPP patch) + and csit-vpp-verify jobs (i.e. CSIT patch). + Environment TAGs ---------------- diff --git a/tests/suites/fds_related_tests/provider_network.robot b/tests/suites/fds_related_tests/provider_network.robot index db0f9a1e5d..5379204d4f 100644 --- a/tests/suites/fds_related_tests/provider_network.robot +++ b/tests/suites/fds_related_tests/provider_network.robot @@ -19,7 +19,7 @@ | Resource | resources/libraries/robot/double_qemu_setup.robot | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace -| Force Tags | HW_ENV | VM_ENV +| Force Tags | HW_ENV | VM_ENV | SKIP_PATCH | Test Setup | Run Keywords | Setup all DUTs before test | ... | AND | Setup all TGs before traffic script | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} diff --git a/tests/suites/fds_related_tests/tenant_network.robot b/tests/suites/fds_related_tests/tenant_network.robot index 361ffe41fe..5751a3c046 100644 --- a/tests/suites/fds_related_tests/tenant_network.robot +++ b/tests/suites/fds_related_tests/tenant_network.robot @@ -19,7 +19,7 @@ | Resource | resources/libraries/robot/double_qemu_setup.robot | Resource | resources/libraries/robot/qemu.robot | Library | resources.libraries.python.Trace -| Force Tags | HW_ENV | VM_ENV +| Force Tags | HW_ENV | VM_ENV | SKIP_PATCH | Test Setup | Run Keywords | Setup all DUTs before test | ... | AND | Setup all TGs before traffic script | Test Teardown | Run Keywords | Show Packet Trace on All DUTs | ${nodes} -- 2.16.6