X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=docker%2Fvnf%2Ftestcases.yaml;h=938f0b309e8971bc28314322dade02ae833aaf2d;hb=924650dd52ffdb01e9da18aaf545c08ab237f16e;hp=f4318d780f45155479940fa0a3bda906d18f074a;hpb=250a7936cc34e2e22c7a9a8f766c9ee0bdcb9f4c;p=functest.git

diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index f4318d780..938f0b309 100644
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -18,7 +18,7 @@ tiers:
                     some signaling traffic.
                 dependencies:
                     installer: ''
-                    scenario: 'os-nosdn-nofeature-ha'
+                    scenario: 'os-.*-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
                     class: 'CloudifyIms'
@@ -31,44 +31,14 @@ tiers:
                 description: >-
                     This test case is vRouter testing.
                 dependencies:
-                    installer: '^((?!compass|fuel).)*$'
-                    scenario: 'os-nosdn-nofeature-ha'
+                    installer: ''
+                    scenario: 'os-.*-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
                     class: 'CloudifyVrouter'
 
-            -
-                case_name: orchestra_openims
-                project_name: orchestra
-                criteria: 100
-                blocking: false
-                description: >-
-                    OpenIMS VNF deployment with Open Baton (Orchestra)
-                dependencies:
-                    installer: ''
-                    scenario: 'os-nosdn-nofeature-ha'
-                run:
-                    module: 'functest.opnfv_tests.vnf.ims.orchestra_openims'
-                    class: 'OpenImsVnf'
-
-            -
-                case_name: orchestra_clearwaterims
-                project_name: orchestra
-                criteria: 100
-                blocking: false
-                description: >-
-                    ClearwaterIMS VNF deployment with Open Baton (Orchestra)
-                dependencies:
-                    installer: ''
-                    scenario: 'os-nosdn-nofeature-ha'
-                run:
-                    module:
-                        'functest.opnfv_tests.vnf.ims.orchestra_clearwaterims'
-                    class: 'ClearwaterImsVnf'
-
             -
                 case_name: juju_epc
-                enabled: true
                 project_name: functest
                 criteria: 100
                 blocking: false
@@ -77,7 +47,7 @@ tiers:
                     executor.
                 dependencies:
                     installer: ''
-                    scenario: 'os-nosdn-nofeature-ha'
+                    scenario: 'os-.*-nofeature-.*ha'
                 run:
                     module: 'functest.opnfv_tests.vnf.epc.juju_epc'
                     class: 'JujuEpc'