X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-daily-jobs.yaml;h=34aee8a9de898773f1a47f40e5ba79ec103dd5b9;hb=8428109135870ffb3b29cc3f1748458ca576396e;hp=0300b99b22393cc8276a731079c7e582fe7dbbcf;hpb=1f2eb7ab017494dd681917d854e5689fb49e4e38;p=releng.git

diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml
index 0300b99b2..34aee8a9d 100644
--- a/jjb/functest/functest-daily-jobs.yaml
+++ b/jjb/functest/functest-daily-jobs.yaml
@@ -18,6 +18,14 @@
       stream: fraser
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
+    gambia: &gambia
+      stream: gambia
+      branch: 'stable/{stream}'
+      gs-pathname: '/{stream}'
+    hunter: &hunter
+      stream: hunter
+      branch: 'stable/{stream}'
+      gs-pathname: '/{stream}'
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
@@ -36,6 +44,14 @@
           slave-label: fuel-virtual
           installer: fuel
           <<: *master
+      - baremetal:
+          slave-label: fuel-baremetal
+          installer: fuel
+          <<: *gambia
+      - virtual:
+          slave-label: fuel-virtual
+          installer: fuel
+          <<: *gambia
       - baremetal:
           slave-label: fuel-baremetal
           installer: fuel
@@ -70,6 +86,10 @@
           slave-label: compass-virtual
           installer: compass
           <<: *master
+      - arm-virtual:
+          slave-label: compass-arm-virtual
+          installer: compass
+          <<: *master
       - baremetal:
           slave-label: compass-baremetal
           installer: compass
@@ -78,6 +98,22 @@
           slave-label: compass-virtual
           installer: compass
           <<: *fraser
+      - arm-virtual:
+          slave-label: compass-arm-virtual
+          installer: compass
+          <<: *fraser
+      - baremetal:
+          slave-label: compass-baremetal
+          installer: compass
+          <<: *gambia
+      - virtual:
+          slave-label: compass-virtual
+          installer: compass
+          <<: *gambia
+      - arm-virtual:
+          slave-label: compass-arm-virtual
+          installer: compass
+          <<: *gambia
       # apex CI PODs
       - virtual:
           slave-label: apex-virtual-master
@@ -87,6 +123,14 @@
           slave-label: apex-baremetal-master
           installer: apex
           <<: *master
+      - virtual:
+          slave-label: apex-virtual-master
+          installer: apex
+          <<: *gambia
+      - baremetal:
+          slave-label: apex-baremetal-master
+          installer: apex
+          <<: *gambia
       - virtual:
           slave-label: apex-virtual-fraser
           installer: apex
@@ -104,6 +148,14 @@
           slave-label: armband-virtual
           installer: fuel
           <<: *master
+      - armband-baremetal:
+          slave-label: armband-baremetal
+          installer: fuel
+          <<: *gambia
+      - armband-virtual:
+          slave-label: armband-virtual
+          installer: fuel
+          <<: *gambia
       - armband-baremetal:
           slave-label: armband-baremetal
           installer: fuel
@@ -201,7 +253,7 @@
       - 'suite':
           job-timeout: 60
       - 'daily':
-          job-timeout: 480
+          job-timeout: 600
 
     jobs:
       - 'functest-{installer}-{pod}-{testsuite}-{stream}'
@@ -219,6 +271,7 @@
       - throttle:
           enabled: true
           max-per-node: 1
+          max-total: 10
           option: 'project'
 
     wrappers:
@@ -238,6 +291,9 @@
       - string:
           name: DEPLOY_SCENARIO
           default: 'os-nosdn-nofeature-noha'
+      - string:
+          name: DOCKER_TAG
+          default: ''
       - string:
           name: CLEAN_DOCKER_IMAGES
           default: 'false'
@@ -284,19 +340,21 @@
             - 'vping_ssh'
             - 'vping_userdata'
             - 'cinder_test'
-            - 'tempest_smoke_serial'
+            - 'tempest_smoke'
             - 'rally_sanity'
             - 'refstack_defcore'
             - 'patrole'
             - 'odl'
             - 'snaps_smoke'
+            - 'shaker'
+            - 'vmtp'
             - 'neutron_trunk'
             - 'doctor-notification'
             - 'bgpvpn'
             - 'functest-odl-sfc'
             - 'barometercollectd'
             - 'fds'
-            - 'tempest_full_parallel'
+            - 'tempest_full'
             - 'rally_full'
             - 'cloudify_ims'
             - 'vyos_vrouter'
@@ -308,6 +366,7 @@
           choices:
             - 'healthcheck'
             - 'smoke'
+            - 'benchmarking'
             - 'features'
             - 'components'
             - 'vnf'