X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=functest%2Fci%2Ftestcases.yaml;h=6b1eaa9cb0b0b5bc9fb8f8a911b4e02fd407d2ff;hb=e627ff2e267c1c59461571d23b89b21199e49737;hp=7d7c3eb12deb733a1ba027dcf194fdfbfb5844ce;hpb=a593fbca70eb4a5ec6cb0bf5d53838752463065c;p=functest.git

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 7d7c3eb12..6b1eaa9cb 100644
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -37,8 +37,8 @@ tiers:
                     snaps.use_keystone is True, functest must have access to
                     the cloud's private network.
                 dependencies:
-                    installer: '^((?!netvirt|lxd).)*$'
-                    scenario: ''
+                    installer: '^((?!netvirt).)*$'
+                    scenario: '^((?!lxd).)*$'
                 run:
                     module: 'functest.opnfv_tests.openstack.snaps.api_check'
                     class: 'ApiCheck'
@@ -187,25 +187,6 @@ tiers:
                             -  /src/odl_test/csit/suites/openstack/neutron
                             -  /src/odl_test/csit/suites/openstack/connectivity
 
-            -
-                case_name: fds
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    Test Suite for the OpenDaylight SDN Controller when GBP features are
-                    installed. It integrates some test suites from upstream using
-                    Robot as the test framework.
-                dependencies:
-                    installer: 'apex'
-                    scenario: 'odl.*-fdio'
-                run:
-                    module: 'functest.opnfv_tests.sdn.odl.odl'
-                    class: 'ODLTests'
-                    args:
-                        suites:
-                            -  /src/fds/testing/robot
-
             -
                 case_name: snaps_smoke
                 project_name: functest
@@ -235,38 +216,22 @@ tiers:
             Test suites from feature projects
             integrated in functest
         testcases:
-            -
-                case_name: promise
-                project_name: promise
-                criteria: 100
-                blocking: false
-                description: >-
-                    Test suite from Promise project.
-                dependencies:
-                    installer: '(fuel)|(joid)'
-                    scenario: ''
-                run:
-                    module: 'functest.core.feature'
-                    class: 'BashFeature'
-                    args:
-                        cmd: 'run_promise_tests.py'
-
             -
                 case_name: doctor-notification
-                enabled: false
                 project_name: doctor
+                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
                     Test suite from Doctor project.
                 dependencies:
-                    installer: '(apex)|(fuel)'
+                    installer: 'apex'
                     scenario: '^((?!fdio).)*$'
                 run:
                     module: 'functest.core.feature'
                     class: 'BashFeature'
                     args:
-                        cmd: '(cd /src/doctor-test/tests && run.sh)'
+                        cmd: 'doctor-test'
 
             -
                 case_name: bgpvpn
@@ -279,31 +244,11 @@ tiers:
                     installer: '(fuel)|(apex)|(netvirt)'
                     scenario: 'bgpvpn'
                 run:
-                    module: 'functest.core.feature'
-                    class: 'BashFeature'
-                    args:
-                        cmd: 'run_sdnvpn_tests.py'
-
-            -
-                case_name: security_scan
-                enabled: false
-                project_name: securityscanning
-                criteria: 100
-                blocking: false
-                description: >-
-                    Simple Security Scan
-                dependencies:
-                    installer: 'apex'
-                    scenario: '^((?!fdio).)*$'
-                run:
-                    module: 'functest.core.feature'
-                    class: 'BashFeature'
-                    args:
-                        cmd: '. /home/opnfv/functest/conf/stackrc && security_scan --config /usr/local/etc/securityscanning/config.ini'
+                    module: 'sdnvpn.test.functest.run_sdnvpn_tests'
+                    class: 'SdnvpnFunctest'
 
             -
                 case_name: functest-odl-sfc
-                enabled: true
                 project_name: sfc
                 criteria: 100
                 blocking: false
@@ -318,27 +263,10 @@ tiers:
                     args:
                         cmd: 'run_sfc_tests.py'
 
-            -
-                case_name: domino-multinode
-                enabled: false
-                project_name: domino
-                criteria: 100
-                blocking: false
-                description: >-
-                    Test suite from Domino project.
-                dependencies:
-                    installer: ''
-                    scenario: ''
-                run:
-                    module: 'functest.core.feature'
-                    class: 'BashFeature'
-                    args:
-                        cmd: 'run_multinode.sh'
-
             -
                 case_name: barometercollectd
-                enabled: true
                 project_name: barometer
+                enabled: false
                 criteria: 100
                 blocking: false
                 description: >-
@@ -352,6 +280,25 @@ tiers:
                      module: 'baro_tests.barometer'
                      class: 'BarometerCollectd'
 
+            -
+                case_name: fds
+                project_name: fastdatastacks
+                criteria: 100
+                blocking: false
+                description: >-
+                    Test Suite for the OpenDaylight SDN Controller when GBP features are
+                    installed. It integrates some test suites from upstream using
+                    Robot as the test framework.
+                dependencies:
+                    installer: 'apex'
+                    scenario: 'odl.*-fdio'
+                run:
+                    module: 'functest.opnfv_tests.sdn.odl.odl'
+                    class: 'ODLTests'
+                    args:
+                        suites:
+                            -  /src/fds/testing/robot
+
     -
         name: components
         order: 3
@@ -375,24 +322,6 @@ tiers:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'
                     class: 'TempestFullParallel'
 
-            -
-                case_name: tempest_custom
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    The test case allows running a customized list of tempest
-                    test cases defined in a file under
-                    <dir_functest_repo>/functest/opnfv_tests/openstack/
-                      /tempest/custom_tests/test_list.txt
-                    The file is empty and can be customized with the desired tests.
-                dependencies:
-                    installer: 'unknown'
-                    scenario: 'unknown'
-                run:
-                    module: 'functest.opnfv_tests.openstack.tempest.tempest'
-                    class: 'TempestCustom'
-
             -
                 case_name: rally_full
                 project_name: functest
@@ -431,7 +360,7 @@ tiers:
                     class: 'CloudifyIms'
             -
                 case_name: orchestra_openims
-                project_name: functest
+                project_name: orchestra
                 criteria: 100
                 blocking: false
                 description: >-
@@ -445,7 +374,7 @@ tiers:
 
             -
                 case_name: orchestra_clearwaterims
-                project_name: functest
+                project_name: orchestra
                 criteria: 100
                 blocking: false
                 description: >-