Fix components and vnf testcase dependencies

It completes "Leverage to Xtesting 0.51" [1].

[1] https://gerrit.opnfv.org/gerrit/#/c/59755/

Change-Id: Id36f1d84c305829d14e069b6ec5d056256f42fe1
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>

diff --git a/docker/components/testcases.yaml b/docker/components/testcases.yaml
index 081dc4c..5471dd8 100644 (file)
--- a/docker/components/testcases.yaml
+++ b/docker/components/testcases.yaml
@@ -3,7 +3,6 @@ tiers:
     -
         name: components
         order: 3
     -
         name: components
         order: 3

-        ci_loop: 'weekly'

         description: >-
             Extensive testing of OpenStack API.
         testcases:
         description: >-
             Extensive testing of OpenStack API.
         testcases:


@@ -16,9 +15,6 @@ tiers:
                     The list of test cases is generated by
                     Tempest automatically and depends on the parameters of
                     the OpenStack deplopyment.
                     The list of test cases is generated by
                     Tempest automatically and depends on the parameters of
                     the OpenStack deplopyment.

-                dependencies:
-                    installer: ''
-                    scenario: ''

                 run:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'
                     class: 'TempestCommon'
                 run:
                     module: 'functest.opnfv_tests.openstack.tempest.tempest'
                     class: 'TempestCommon'


@@ -33,9 +29,6 @@ tiers:
                 description: >-
                     This test case runs the full suite of scenarios of the
                     OpenStack Rally suite using several threads and iterations.
                 description: >-
                     This test case runs the full suite of scenarios of the
                     OpenStack Rally suite using several threads and iterations.

-                dependencies:
-                    installer: ''
-                    scenario: ''

                 run:
                     module: 'functest.opnfv_tests.openstack.rally.rally'
                     class: 'RallyFull'
                 run:
                     module: 'functest.opnfv_tests.openstack.rally.rally'
                     class: 'RallyFull'

diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index bc2a425..1b2bd98 100644 (file)
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -3,7 +3,6 @@ tiers:
     -
         name: vnf
         order: 4
     -
         name: vnf
         order: 4

-        ci_loop: '(daily)|(weekly)'

         description: >-
             Collection of VNF test cases.
         testcases:
         description: >-
             Collection of VNF test cases.
         testcases:


@@ -15,8 +14,7 @@ tiers:
                 description: >-
                     This test case deploys the Cloudify orchestrator.
                 dependencies:
                 description: >-
                     This test case deploys the Cloudify orchestrator.
                 dependencies:

-                    installer: ''
-                    scenario: 'os-.*-nofeature-.*ha'
+                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'

                 run:
                     module: 'functest.core.cloudify'
                     class: 'Cloudify'
                 run:
                     module: 'functest.core.cloudify'
                     class: 'Cloudify'


@@ -30,8 +28,7 @@ tiers:
                     Clearwater using the Cloudify orchestrator. It also runs
                     some signaling traffic.
                 dependencies:
                     Clearwater using the Cloudify orchestrator. It also runs
                     some signaling traffic.
                 dependencies:

-                    installer: ''
-                    scenario: 'os-.*-nofeature-.*ha'
+                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'

                 run:
                     module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
                     class: 'CloudifyIms'
                 run:
                     module: 'functest.opnfv_tests.vnf.ims.cloudify_ims'
                     class: 'CloudifyIms'


@@ -44,8 +41,7 @@ tiers:
                 description: >-
                     This test case is vRouter testing.
                 dependencies:
                 description: >-
                     This test case is vRouter testing.
                 dependencies:

-                    installer: ''
-                    scenario: 'os-.*-nofeature-.*ha'
+                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'

                 run:
                     module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
                     class: 'CloudifyVrouter'
                 run:
                     module: 'functest.opnfv_tests.vnf.router.cloudify_vrouter'
                     class: 'CloudifyVrouter'


@@ -59,8 +55,7 @@ tiers:
                     vEPC validation with Juju as VNF manager and ABoT as test
                     executor.
                 dependencies:
                     vEPC validation with Juju as VNF manager and ABoT as test
                     executor.
                 dependencies:

-                    installer: ''
-                    scenario: 'os-.*-nofeature-.*ha'
+                    - DEPLOY_SCENARIO: 'os-.*-nofeature-.*ha'

                 run:
                     module: 'functest.opnfv_tests.vnf.epc.juju_epc'
                     class: 'JujuEpc'
                 run:
                     module: 'functest.opnfv_tests.vnf.epc.juju_epc'
                     class: 'JujuEpc'