X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=b856795e469aa63dc463907f43634df6eeae0a25;hb=a9867ae3c77432fc4ad843450a86b6eaacc0a79e;hp=7f64de2b15b0ec12b724dbaea273c611676b4ff9;hpb=74d117bf8fac8d2059f04d07d8b2c58c62d7f2e1;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 7f64de2b1..b856795e4 100644
--- 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/ \
@@ -269,7 +266,6 @@
       - tempest_smoke
       - neutron-tempest-plugin-api
       - rally_sanity
-      - rally_jobs
       - refstack_defcore
       - patrole
       - snaps_smoke
@@ -280,6 +276,15 @@
     jobs:
       - '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
@@ -297,6 +302,14 @@
     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'
@@ -410,8 +423,6 @@
               <<: *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}-patrole-run'
@@ -426,6 +437,11 @@
               <<: *functest-jobs
             - 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:
@@ -440,6 +456,9 @@
               <<: *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:
@@ -697,8 +716,6 @@
               <<: *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}-patrole-run'
@@ -713,6 +730,11 @@
               <<: *functest-jobs
             - 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:
@@ -727,6 +749,9 @@
               <<: *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:
@@ -884,8 +909,6 @@
               <<: *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}-patrole-run'
@@ -900,6 +923,11 @@
               <<: *functest-jobs
             - 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:
@@ -914,6 +942,9 @@
               <<: *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: