From: Cédric Ollivier <cedric.ollivier@orange.com>
Date: Fri, 1 May 2020 08:43:56 +0000 (+0200)
Subject: Remove neutron_trunk
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=3a5dc8589b8c2872ee22fa2779cabff37fa2f922;p=functest.git

Remove neutron_trunk

It was merged in neutron-tempest-plugin.

Change-Id: I87ca29154f727021c007a386badcadc9f3858506
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit c31996fccb822a8839857590f4fcd23a8511b279)
---

diff --git a/docker/smoke/testcases.yaml b/docker/smoke/testcases.yaml
index 493ba44a1..1ee172417 100644
--- a/docker/smoke/testcases.yaml
+++ b/docker/smoke/testcases.yaml
@@ -170,24 +170,6 @@ tiers:
                             - 'test_create_network_provider_segmentation_id'
                             - 'test_list_metadef_namespaces'
 
-            -
-                case_name: neutron_trunk
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    This test case runs the neutron trunk subtest of the
-                    OpenStack Tempest suite. The list of test cases is
-                    generated by Tempest having as input the relevant
-                    testcase list file.
-                run:
-                    name: tempest_common
-                    args:
-                        mode: 'neutron_tempest_plugin.(api|scenario).test_trunk'
-                        neutron_extensions:
-                            - trunk
-                            - trunk-details
-
             -
                 case_name: networking-bgpvpn
                 project_name: functest
diff --git a/docs/release/release-notes/functest-release.rst b/docs/release/release-notes/functest-release.rst
index c3f80dfc8..f0e061576 100644
--- a/docs/release/release-notes/functest-release.rst
+++ b/docs/release/release-notes/functest-release.rst
@@ -42,7 +42,6 @@ The internal test cases are:
  * rally_sanity
  * refstack_defcore
  * patrole
- * neutron_trunk
  * networking-bgpvpn
  * networking-sfc
  * barbican
diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 0f706ed25..2ce2271b4 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -348,24 +348,6 @@ tiers:
                             - 'test_create_network_provider_segmentation_id'
                             - 'test_list_metadef_namespaces'
 
-            -
-                case_name: neutron_trunk
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    This test case runs the neutron trunk subtest of the
-                    OpenStack Tempest suite. The list of test cases is
-                    generated by Tempest having as input the relevant
-                    testcase list file.
-                run:
-                    name: tempest_common
-                    args:
-                        mode: 'neutron_tempest_plugin.(api|scenario).test_trunk'
-                        neutron_extensions:
-                            - trunk
-                            - trunk-details
-
             -
                 case_name: networking-bgpvpn
                 project_name: functest