Move rally_full in benchmarking

It allows merging all benchmarking testcases in one tiers and saves
lots of time as they could all run in parallel.

Change-Id: I551179709d2ce862056c1f5fcc1e16ef0b776dd4
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
(cherry picked from commit cec721055631734d2d1d39bd09cfa1404ee1d32e)

diff --git a/docker/benchmarking/testcases.yaml b/docker/benchmarking/testcases.yaml
index fd93cd3..95f88a0 100644 (file)
--- a/docker/benchmarking/testcases.yaml
+++ b/docker/benchmarking/testcases.yaml
@@ -7,6 +7,17 @@ tiers:
             Run several OpenStack performance tools
             https://docs.openstack.org/performance-docs/latest/methodologies/tools.html
         testcases:
+            -
+                case_name: rally_full
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    This test case runs the full suite of scenarios of the
+                    OpenStack Rally suite using several threads and iterations.
+                run:
+                    name: rally_full
+
             -
                 case_name: rally_jobs
                 project_name: functest

diff --git a/docker/components/Dockerfile b/docker/components/Dockerfile
deleted file mode 100644 (file)
index db0ffc8..0000000
--- a/docker/components/Dockerfile
+++ /dev/null
@@ -1,4 +0,0 @@
-FROM opnfv/functest-tempest:hunter
-
-COPY testcases.yaml /usr/lib/python2.7/site-packages/xtesting/ci/testcases.yaml
-CMD ["run_tests", "-t", "all"]

diff --git a/docker/components/hooks/post_checkout b/docker/components/hooks/post_checkout
deleted file mode 100644 (file)
index 8d0e981..0000000
--- a/docker/components/hooks/post_checkout
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-from="${DOCKER_REPO%/*}/functest-core:${DOCKER_TAG}"
-sed -i "s|^FROM.*$|FROM ${from}|" Dockerfile
-
-exit $?

diff --git a/docker/components/testcases.yaml b/docker/components/testcases.yaml
deleted file mode 100644 (file)
index d0bfa0a..0000000
--- a/docker/components/testcases.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
----
-tiers:
-    -
-        name: components
-        order: 4
-        description: >-
-            Extensive testing of OpenStack API.
-        testcases:
-            -
-                case_name: tempest_full
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    The list of test cases is generated by
-                    Tempest automatically and depends on the parameters of
-                    the OpenStack deployment.
-                    https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L83
-                run:
-                    name: tempest_common
-                    args:
-                        mode: '(?!.*\[.*\bslow\b.*\])(^tempest\.api)'
-                        option:
-                            - '--concurrency=4'
-
-            -
-                case_name: tempest_scenario
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    The list of test cases is generated by
-                    Tempest automatically and depends on the parameters of
-                    the OpenStack deployment.
-                    https://github.com/openstack/tempest/blob/18.0.0/tox.ini#L84
-                run:
-                    name: tempest_common
-                    args:
-                        mode: '(?!.*\[.*\bslow\b.*\])(^tempest\.scenario)'
-                        option:
-                            - '--concurrency=1'
-
-            -
-                case_name: rally_full
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    This test case runs the full suite of scenarios of the
-                    OpenStack Rally suite using several threads and iterations.
-                run:
-                    name: rally_full
-                    args:
-                        optional:
-                            - 'gnocchi'

diff --git a/docker/vnf/testcases.yaml b/docker/vnf/testcases.yaml
index 9822a51..7d5548b 100644 (file)
--- a/docker/vnf/testcases.yaml
+++ b/docker/vnf/testcases.yaml
@@ -2,7 +2,7 @@
 tiers:
     -
         name: vnf
-        order: 5
+        order: 4
         description: >-
             Collection of VNF test cases.
         testcases:

diff --git a/functest/ci/testcases.yaml b/functest/ci/testcases.yaml
index 0b75c28..3001591 100644 (file)
--- a/functest/ci/testcases.yaml
+++ b/functest/ci/testcases.yaml
@@ -384,6 +384,17 @@ tiers:
             Run several OpenStack performance tools
             https://docs.openstack.org/performance-docs/latest/methodologies/tools.html
         testcases:
+            -
+                case_name: rally_full
+                project_name: functest
+                criteria: 100
+                blocking: false
+                description: >-
+                    This test case runs the full suite of scenarios of the
+                    OpenStack Rally suite using several threads and iterations.
+                run:
+                    name: rally_full
+
             -
                 case_name: rally_jobs
                 project_name: functest
@@ -509,26 +520,9 @@ tiers:
                 run:
                     name: stor4nfv_os
 
-    -
-        name: components
-        order: 4
-        description: >-
-            Extensive testing of OpenStack API.
-        testcases:
-            -
-                case_name: rally_full
-                project_name: functest
-                criteria: 100
-                blocking: false
-                description: >-
-                    This test case runs the full suite of scenarios of the
-                    OpenStack Rally suite using several threads and iterations.
-                run:
-                    name: rally_full
-
     -
         name: vnf
-        order: 5
+        order: 4
         description: >-
             Collection of VNF test cases.
         testcases: