Conform with new Functest test list

[releng.git] / jjb / functest / functest.yaml

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 7f64de2..ae9a8b7 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -97,9 +97,6 @@
             -e EXTERNAL_NETWORK=public \
             -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
             -v /home/opnfv/functest/images:/home/opnfv/functest/images \
-            -v /home/opnfv/functest/tempest_blacklist.yaml:\
-          /usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/\
-          tempest/custom_tests/blacklist.yaml \ \
             $image run_tests -t {test}
           res=$?
           gsutil -m cp -r $WORKSPACE/ \
@@ -258,6 +255,7 @@
       - odl
       - api_check
       - snaps_health_check
+      - tempest_smoke
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -266,11 +264,11 @@
     <<: *functest-params
     container: 'functest-smoke'
     test:
-      - tempest_smoke
       - neutron-tempest-plugin-api
       - rally_sanity
-      - rally_jobs
       - refstack_defcore
+      - tempest_full
+      - tempest_scenario
       - patrole
       - snaps_smoke
       - neutron_trunk
@@ -285,6 +283,7 @@
     <<: *functest-params
     container: 'functest-benchmarking'
     test:
+      - rally_jobs
       - vmtp
       - shaker
     jobs:
@@ -295,8 +294,6 @@
     <<: *functest-params
     container: 'functest-components'
     test:
-      - tempest_full
-      - tempest_scenario
       - rally_full
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
@@ -401,19 +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}-rally_jobs-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'
@@ -429,6 +428,8 @@
       - 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'
@@ -436,10 +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
             - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
               <<: *functest-jobs
       - multijob:
@@ -688,19 +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}-rally_jobs-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'
@@ -716,6 +715,8 @@
       - 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'
@@ -723,10 +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
             - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
               <<: *functest-jobs
       - multijob:
@@ -875,19 +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}-rally_jobs-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'
@@ -903,6 +902,8 @@
       - 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'
@@ -910,10 +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
             - name: 'functest-opnfv-functest-components-{tag}-rally_full-run'
               <<: *functest-jobs
       - multijob: