X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest.yaml;h=0173c99a3c323cf9f6c041e26096525a4a1b7c1d;hb=refs%2Fchanges%2F14%2F68714%2F1;hp=fc0718a9ce71eb32614869ac3146b02b921048a3;hpb=f7df2d437f5b4b15d3c374da4d24b137cc672916;p=releng.git

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index fc0718a9c..0173c99a3 100644
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -11,15 +11,19 @@
       - latest:
           branch: master
           slave: lf-virtual9
+          dashboard_url: http://172.30.13.94
       - jerma:
           branch: stable/jerma
           slave: lf-virtual4
+          dashboard_url: http://172.30.13.89
       - iruya:
           branch: stable/iruya
           slave: lf-virtual4
+          dashboard_url: http://172.30.13.89
       - hunter:
           branch: stable/hunter
           slave: lf-virtual6
+          dashboard_url: http://172.30.13.91
 
 - parameter:
     name: functest-slave
@@ -46,6 +50,7 @@
     name: 'functest-build-containers'
     <<: *functest-containers
     test: '{test}'
+    dashboard_url: '{dashboard_url}'
 
 - functest-build-containers: &functest-build-containers
     name: 'functest-build-containers'
@@ -115,6 +120,7 @@
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             -e DEBUG=True \
             -e EXTERNAL_NETWORK=public \
+            -e DASHBOARD_URL={dashboard_url} \
             -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/python$py/\
@@ -254,6 +260,10 @@
       - cinder_test
       - odl
       - tempest_smoke
+      - tempest_horizon
+    exclude:
+      - tag: hunter
+        test: tempest_horizon
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -263,6 +273,8 @@
     container: 'functest-smoke'
     test:
       - neutron-tempest-plugin-api
+      - tempest_keystone
+      - tempest_cinder
       - rally_sanity
       - refstack_defcore
       - refstack_compute
@@ -296,6 +308,10 @@
         test: tempest_slow
       - tag: hunter
         test: octavia
+      - tag: hunter
+        test: tempest_keystone
+      - tag: hunter
+        test: tempest_cinder
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -388,11 +404,17 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_horizon-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
           projects:
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -642,11 +664,17 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_horizon-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
           projects:
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -809,11 +837,17 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_horizon-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-smoke:{tag}
           projects:
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'