Conform with new Functest test list

It conforms with "Move testcases in the right tiers" [1].
This patch has to be merged first to ensure the right gating in
Functest (chicken & egg situation).

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

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

1 files changed, 28 insertions, 62 deletions

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index b856795e4..ae9a8b705 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -255,6 +255,7 @@
       - odl
       - api_check
       - snaps_health_check
+      - tempest_smoke
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -263,10 +264,11 @@
     <<: *functest-params
     container: 'functest-smoke'
     test:
-      - tempest_smoke
       - neutron-tempest-plugin-api
       - rally_sanity
       - refstack_defcore
+      - tempest_full
+      - tempest_scenario
       - patrole
       - snaps_smoke
       - neutron_trunk
@@ -277,19 +279,11 @@
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
 - project:
-    name: 'functest-opnfv-functest-smoke-2'
-    <<: *functest-params
-    container: 'functest-smoke'
-    test:
-      - rally_jobs
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-{test}-run'
-
-- project:
     name: 'functest-opnfv-functest-benchmarking'
     <<: *functest-params
     container: 'functest-benchmarking'
     test:
+      - rally_jobs
       - vmtp
       - shaker
     jobs:
@@ -300,16 +294,6 @@
     <<: *functest-params
     container: 'functest-components'
     test:
-      - tempest_full
-      - tempest_scenario
-    jobs:
-      - 'functest-{repo}-{container}-{tag}-{test}-run'
-
-- project:
-    name: 'functest-opnfv-functest-components-2'
-    <<: *functest-params
-    container: 'functest-components'
-    test:
       - rally_full
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
@@ -414,17 +398,21 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_smoke-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run'
@@ -438,13 +426,10 @@
             - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *functest-jobs
       - multijob:
-          name: opnfv/functest-smoke:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run'
-              <<: *functest-jobs
-      - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
@@ -452,13 +437,6 @@
       - multijob:
           name: opnfv/functest-components:{tag}
           projects:
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_full-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
-              <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-components:{tag}
-          projects:
             - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
               <<: *functest-jobs
       - multijob:
@@ -707,17 +685,21 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_smoke-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run'
@@ -731,13 +713,10 @@
             - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *functest-jobs
       - multijob:
-          name: opnfv/functest-smoke:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run'
-              <<: *functest-jobs
-      - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
@@ -745,13 +724,6 @@
       - multijob:
           name: opnfv/functest-components:{tag}
           projects:
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_full-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
-              <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-components:{tag}
-          projects:
             - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
               <<: *functest-jobs
       - multijob:
@@ -900,17 +872,21 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
           projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_smoke-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run'
@@ -924,13 +900,10 @@
             - name: 'functest-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *functest-jobs
       - multijob:
-          name: opnfv/functest-smoke:{tag}
-          projects:
-            - name: 'functest-opnfv-functest-smoke-{tag}-rally_jobs-run'
-              <<: *functest-jobs
-      - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
+            - name: 'functest-opnfv-functest-benchmarking-{tag}-rally_jobs-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-vmtp-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-shaker-run'
@@ -938,13 +911,6 @@
       - multijob:
           name: opnfv/functest-components:{tag}
           projects:
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_full-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-components-{tag}-tempest_scenario-run'
-              <<: *functest-jobs
-      - multijob:
-          name: opnfv/functest-components:{tag}
-          projects:
             - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
               <<: *functest-jobs
       - multijob: