Fix bgpcep testplans

- Remove GR feature test, it is not working in any branch.
- Set same userfeatures test for all branches.
- Remove tell-based test in bgp-ingest for fluorine.

Change-Id: I41e697760ce5271b2a5c7c69bfcad4a039c84e21
Signed-off-by: Luis Gomez <ecelgp@gmail.com>

diff --git a/csit/testplans/bgpcep-bgp-ingest-fluorine.txt b/csit/testplans/bgpcep-bgp-ingest-fluorine.txt
new file mode 100644 (file)
index 0000000..14d7ea7
--- /dev/null
+++ b/csit/testplans/bgpcep-bgp-ingest-fluorine.txt
@@ -0,0 +1,14 @@
+# Copyright (c) 2015 Cisco Systems, Inc. and others. All rights reserved.
+#
+# This program and the accompanying materials are made available under the
+# terms of the Eclipse Public License v1.0 which accompanies this distribution,
+# and is available at http://www.eclipse.org/legal/epl-v10.html
+
+# Place the suites in run order:
+integration/test/csit/suites/bgpcep/bgpclustering/singlepeer_pc_shm_300kroutes.robot
+integration/test/csit/suites/bgpcep/bgpingest/singlepeer_prefixcount.robot
+integration/test/csit/suites/bgpcep/bgpingest/singlepeer_changecount.robot
+integration/test/csit/suites/bgpcep/bgpingest/bgp_app_peer_prefixcount.robot
+integration/test/csit/suites/bgpcep/bgpingest/manypeers_prefixcount.robot
+integration/test/csit/suites/bgpcep/bgpingest/manypeers_peercount.robot
+integration/test/csit/suites/bgpcep/bgpingest/manypeers_changecount.robot

diff --git a/csit/testplans/bgpcep-userfeatures-fluorine.txt b/csit/testplans/bgpcep-userfeatures-fluorine.txt
deleted file mode 100644 (file)
index a45fffd..0000000
--- a/csit/testplans/bgpcep-userfeatures-fluorine.txt
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright (c) 2018 Cisco Systems, Inc. and others. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v1.0 which accompanies this distribution,
-# and is available at http://www.eclipse.org/legal/epl-v10.html
-
-# Place the suites in run order:
-integration/test/csit/suites/bgpcep/bgpfunct/050_bmp_basic.robot
-integration/test/csit/suites/bgpcep/pcepuser/pcepuser.robot
-integration/test/csit/suites/bgpcep/bgpfunct/bgp_functional_md5.robot
-integration/test/csit/suites/bgpcep/bgpuser/basic.robot
-integration/test/csit/suites/bgpcep/bgpfunct/bgp_ipv6_basic.robot
-integration/test/csit/suites/bgpcep/bgpuser/bgp_app_peer_basic.robot
-integration/test/csit/suites/bgpcep/bgpuser/ibgp_peers_basic.robot
-integration/test/csit/suites/bgpcep/bgpuser/ebgp_peers_basic.robot
-integration/test/csit/suites/bgpcep/bgpflowspec/010_bgp_flowspec.robot
-integration/test/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot
-integration/test/csit/suites/bgpcep/bgpfunct/010_bgp_functional_l3vpn.robot
-integration/test/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot
-integration/test/csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot
-integration/test/csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot
-integration/test/csit/suites/bgpcep/bgpfunct/060_bgp_functional_mvpn.robot
-integration/test/csit/suites/bgpcep/bgpfunct/070_bgp_functional_l3vpn_mcast.robot
-integration/test/csit/suites/bgpcep/bgpfunct/080_bgp_functional_rt_constrain.robot
-integration/test/csit/suites/bgpcep/bgpfunct/090_bgp_functional_rt_constrain_validation.robot
-integration/test/csit/suites/bgpcep/bgpfunct/bgp_policies_default.robot
-integration/test/csit/suites/bgpcep/tcpmd5user/tcpmd5user.robot

diff --git a/csit/testplans/bgpcep-userfeatures-neon.txt b/csit/testplans/bgpcep-userfeatures-neon.txt
deleted file mode 100644 (file)
index 81617b2..0000000
--- a/csit/testplans/bgpcep-userfeatures-neon.txt
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright (c) 2018 Cisco Systems, Inc. and others. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v1.0 which accompanies this distribution,
-# and is available at http://www.eclipse.org/legal/epl-v10.html
-
-# Place the suites in run order:
-integration/test/csit/suites/bgpcep/bgpfunct/050_bmp_basic.robot
-integration/test/csit/suites/bgpcep/pcepuser/pcepuser.robot
-integration/test/csit/suites/bgpcep/bgpfunct/bgp_functional_md5.robot
-integration/test/csit/suites/bgpcep/bgpuser/basic.robot
-integration/test/csit/suites/bgpcep/bgpfunct/bgp_ipv6_basic.robot
-integration/test/csit/suites/bgpcep/bgpuser/bgp_app_peer_basic.robot
-integration/test/csit/suites/bgpcep/bgpuser/ibgp_peers_basic.robot
-integration/test/csit/suites/bgpcep/bgpuser/ebgp_peers_basic.robot
-integration/test/csit/suites/bgpcep/bgpflowspec/010_bgp_flowspec.robot
-integration/test/csit/suites/bgpcep/bgpuser/ibgp_peer_lsp.robot
-integration/test/csit/suites/bgpcep/bgpfunct/010_bgp_functional_l3vpn.robot
-integration/test/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot
-integration/test/csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot
-integration/test/csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot
-integration/test/csit/suites/bgpcep/bgpfunct/060_bgp_functional_mvpn.robot
-integration/test/csit/suites/bgpcep/bgpfunct/070_bgp_functional_l3vpn_mcast.robot
-integration/test/csit/suites/bgpcep/bgpfunct/080_bgp_functional_rt_constrain.robot
-integration/test/csit/suites/bgpcep/bgpfunct/090_bgp_functional_rt_constrain_validation.robot
-integration/test/csit/suites/bgpcep/bgpfunct/100_bgp_functional_graceful_restart.robot
-integration/test/csit/suites/bgpcep/bgpfunct/bgp_policies_default.robot
-integration/test/csit/suites/bgpcep/tcpmd5user/tcpmd5user.robot

diff --git a/csit/testplans/bgpcep-userfeatures.txt b/csit/testplans/bgpcep-userfeatures.txt
index 1e2ecd08d90fb98eca6f5a5884421d9b6748b9c2..a45fffd95ef9dcf9fb8f110a3493c1d7d4a6c8f2 100644 (file)
--- a/csit/testplans/bgpcep-userfeatures.txt
+++ b/csit/testplans/bgpcep-userfeatures.txt
@@ -19,5 +19,9 @@ integration/test/csit/suites/bgpcep/bgpfunct/010_bgp_functional_l3vpn.robot
 integration/test/csit/suites/bgpcep/bgpfunct/030_bgp_functional_evpn.robot
 integration/test/csit/suites/bgpcep/bgpfunct/040_bgp_functional_route_ref.robot
 integration/test/csit/suites/bgpcep/bgpfunct/020_bgp_functional_multipath.robot
+integration/test/csit/suites/bgpcep/bgpfunct/060_bgp_functional_mvpn.robot
+integration/test/csit/suites/bgpcep/bgpfunct/070_bgp_functional_l3vpn_mcast.robot
+integration/test/csit/suites/bgpcep/bgpfunct/080_bgp_functional_rt_constrain.robot
+integration/test/csit/suites/bgpcep/bgpfunct/090_bgp_functional_rt_constrain_validation.robot
 integration/test/csit/suites/bgpcep/bgpfunct/bgp_policies_default.robot
 integration/test/csit/suites/bgpcep/tcpmd5user/tcpmd5user.robot