Merge "Leverage on Xtesting"

[functest.git] / functest / ci / testcases.yaml

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 5245079..dc421ef 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -231,7 +231,7 @@ tiers:
                     installer: 'apex'
                     scenario: '^((?!fdio).)*$'
                 run:
-                    module: 'functest.core.feature'
+                    module: 'xtesting.core.feature'
                     class: 'BashFeature'
                     args:
                         cmd: 'doctor-test'
@@ -262,7 +262,7 @@ tiers:
                     installer: ''
                     scenario: 'odl.*sfc'
                 run:
-                    module: 'functest.core.feature'
+                    module: 'xtesting.core.feature'
                     class: 'BashFeature'
                     args:
                         cmd: 'run_sfc_tests.py'
@@ -277,7 +277,7 @@ tiers:
                     the proper configuration and basic functionality of all the
                     collectd plugins as described in the Project Release Plan
                 dependencies:
-                    installer: 'apex'
+                    installer: '(apex)|(compass)'
                     scenario: 'bar'
                 run:
                     module: 'baro_tests.barometer'
@@ -328,7 +328,7 @@ tiers:
             -
                 case_name: rally_full
                 project_name: functest
-                criteria: 90
+                criteria: 100
                 blocking: false
                 description: >-
                     This test case runs the full suite of scenarios of the
@@ -358,7 +358,7 @@ tiers:
                     some signaling traffic.
                 dependencies:
                     installer: ''
-                    scenario: 'os-nosdn-nofeature-ha'
+                    scenario: 'os-nosdn-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
                     class: 'CloudifyIms'
@@ -371,8 +371,8 @@ tiers:
                 description: >-
                     This test case is vRouter testing.
                 dependencies:
-                    installer: '^((?!compass|fuel).)*$'
-                    scenario: 'os-nosdn-nofeature-ha'
+                    installer: ''
+                    scenario: 'os-nosdn-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
                     class: 'CloudifyVrouter'
@@ -380,13 +380,14 @@ tiers:
             -
                 case_name: orchestra_openims
                 project_name: orchestra
+                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
                     OpenIMS VNF deployment with Open Baton (Orchestra)
                 dependencies:
                     installer: ''
-                    scenario: 'os-nosdn-nofeature-ha'
+                    scenario: 'os-nosdn-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.orchestra_openims'
                     class: 'OpenImsVnf'
@@ -394,13 +395,14 @@ tiers:
             -
                 case_name: orchestra_clearwaterims
                 project_name: orchestra
+                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
                     ClearwaterIMS VNF deployment with Open Baton (Orchestra)
                 dependencies:
                     installer: ''
-                    scenario: 'os-nosdn-nofeature-ha'
+                    scenario: 'os-nosdn-nofeature-.*ha'
                 run:
                     module:
                         'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims'
@@ -408,7 +410,6 @@ tiers:
 
             -
                 case_name: juju_epc
-                enabled: true
                 project_name: functest
                 criteria: 100
                 blocking: false
@@ -417,7 +418,7 @@ tiers:
                     executor.
                 dependencies:
                     installer: ''
-                    scenario: 'os-nosdn-nofeature-ha'
+                    scenario: 'os-nosdn-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.epc.juju_epc'
                     class: 'JujuEpc'