summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCédric Ollivier <cedric.ollivier@orange.com>2017-11-30 11:37:11 +0100
committerCédric Ollivier <cedric.ollivier@orange.com>2017-11-30 13:44:08 +0100
commit7d30d9b06faa49d400000c72916c49ca0a01ac06 (patch)
tree4399c9033b0d37c97aab22d7177bd6996b8fbc6c
parenteb104ac8d30cef77d80d92f5d7eccb3a9a916fa1 (diff)
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)
-rw-r--r--docker/vnf/testcases.yaml29
-rw-r--r--functest/ci/testcases.yaml29
2 files changed, 30 insertions, 28 deletions
diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index 4117a6583..eccabbe5e 100644
--- 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 3b28b0fb6..b08b7d674 100644
--- 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'