Reorder Vnf testcases

Cloudify IMS testcases could easily tigger jjob timeouts.
Vyos_router should run before as it ends much quickier.

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

diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index 4117a65..eccabbe 100644 (file)
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -20,6 +20,21 @@ tiers:
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
                     class: 'CloudifyIms'
+
+            -
+                case_name: vyos_vrouter
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    This test case is vRouter testing.
+                dependencies:
+                    installer: '^((?!compass|fuel).)*$'
+                    scenario: 'os-nosdn-nofeature-ha'
+                run:
+                    module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
+                    class: 'CloudifyVrouter'
+
             -
                 case_name: orchestra_openims
                 project_name: orchestra
@@ -47,17 +62,3 @@ tiers:
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims'
                     class: 'ClearwaterImsVnf'
-
-            -
-                case_name: vyos_vrouter
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    This test case is vRouter testing.
-                dependencies:
-                    installer: '^((?!compass|fuel).)*$'
-                    scenario: 'os-nosdn-nofeature-ha'
-                run:
-                    module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
-                    class: 'CloudifyVrouter'

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 3b28b0f..b08b7d6 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -388,6 +388,21 @@ tiers:
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
                     class: 'CloudifyIms'
+
+            -
+                case_name: vyos_vrouter
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    This test case is vRouter testing.
+                dependencies:
+                    installer: '^((?!compass|fuel).)*$'
+                    scenario: 'os-nosdn-nofeature-ha'
+                run:
+                    module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
+                    class: 'CloudifyVrouter'
+
             -
                 case_name: orchestra_openims
                 project_name: orchestra
@@ -415,17 +430,3 @@ tiers:
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims'
                     class: 'ClearwaterImsVnf'
-
-            -
-                case_name: vyos_vrouter
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    This test case is vRouter testing.
-                dependencies:
-                    installer: '^((?!compass|fuel).)*$'
-                    scenario: 'os-nosdn-nofeature-ha'
-                run:
-                    module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
-                    class: 'CloudifyVrouter'