X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-daily-jobs.yaml;h=e1f15fd935c4ff2ec52bdf6c6b959b7c9e5292cd;hb=7d251e861b54f1a9d9ab192c7c65e5a810541e43;hp=c81046c13c9a03b060f5b91d3bb2c04d7e6264fc;hpb=51a7113c8e7be8b2287641dea7a8a227fc02daa2;p=releng.git

diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml
index c81046c13..e1f15fd93 100644
--- a/jjb/functest/functest-daily-jobs.yaml
+++ b/jjb/functest/functest-daily-jobs.yaml
@@ -14,8 +14,12 @@
       stream: master
       branch: '{stream}'
       gs-pathname: ''
-    fraser: &fraser
-      stream: fraser
+    iruya: &iruya
+      stream: iruya
+      branch: 'stable/{stream}'
+      gs-pathname: '/{stream}'
+    hunter: &hunter
+      stream: hunter
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
     # -------------------------------
@@ -39,45 +43,11 @@
       - baremetal:
           slave-label: fuel-baremetal
           installer: fuel
-          <<: *fraser
+          <<: *hunter
       - virtual:
           slave-label: fuel-virtual
           installer: fuel
-          <<: *fraser
-      # joid CI PODs
-      - baremetal:
-          slave-label: joid-baremetal
-          installer: joid
-          <<: *master
-      - virtual:
-          slave-label: joid-virtual
-          installer: joid
-          <<: *master
-      - baremetal:
-          slave-label: joid-baremetal
-          installer: joid
-          <<: *fraser
-      - virtual:
-          slave-label: joid-virtual
-          installer: joid
-          <<: *fraser
-      # compass CI PODs
-      - baremetal:
-          slave-label: compass-baremetal
-          installer: compass
-          <<: *master
-      - virtual:
-          slave-label: compass-virtual
-          installer: compass
-          <<: *master
-      - baremetal:
-          slave-label: compass-baremetal
-          installer: compass
-          <<: *fraser
-      - virtual:
-          slave-label: compass-virtual
-          installer: compass
-          <<: *fraser
+          <<: *hunter
       # apex CI PODs
       - virtual:
           slave-label: apex-virtual-master
@@ -88,120 +58,37 @@
           installer: apex
           <<: *master
       - virtual:
-          slave-label: apex-virtual-fraser
+          slave-label: apex-virtual-master
           installer: apex
-          <<: *fraser
+          <<: *hunter
       - baremetal:
-          slave-label: apex-baremetal-fraser
+          slave-label: apex-baremetal-master
           installer: apex
-          <<: *fraser
+          <<: *hunter
       # armband CI PODs
       - armband-baremetal:
           slave-label: armband-baremetal
           installer: fuel
           <<: *master
-      - armband-virtual:
-          slave-label: armband-virtual
-          installer: fuel
-          <<: *master
       - armband-baremetal:
           slave-label: armband-baremetal
           installer: fuel
-          <<: *fraser
-      - armband-virtual:
-          slave-label: armband-virtual
-          installer: fuel
-          <<: *fraser
-      # daisy CI PODs
-      - baremetal:
-          slave-label: daisy-baremetal
-          installer: daisy
-          <<: *master
-      - virtual:
-          slave-label: daisy-virtual
-          installer: daisy
-          <<: *master
-      - baremetal:
-          slave-label: daisy-baremetal
-          installer: daisy
-          <<: *fraser
-      - virtual:
-          slave-label: daisy-virtual
-          installer: daisy
-          <<: *fraser
-      # netvirt 3rd party ci
-      - virtual:
-          slave-label: odl-netvirt-virtual
-          installer: netvirt
-          <<: *master
-      # -------------------------------
-      #        None-CI PODs
-      # -------------------------------
-      - orange-pod1:
-          slave-label: '{pod}'
-          installer: joid
-          <<: *master
-      - orange-pod5:
-          slave-label: '{pod}'
-          installer: fuel
-          <<: *master
-      - orange-pod2:
-          slave-label: '{pod}'
-          installer: joid
-          <<: *master
-      - baremetal-centos:
-          slave-label: 'intel-pod8'
-          installer: compass
-          <<: *master
-      - nokia-pod1:
-          slave-label: '{pod}'
-          installer: apex
-          <<: *master
+          <<: *hunter
+      # fuel NONE CI PODs
       - zte-pod1:
-          slave-label: '{pod}'
+          slave-label: fuel-baremetal
           installer: fuel
           <<: *master
-      - zte-pod1:
-          slave-label: '{pod}'
+      - itri-pod1:
+          slave-label: fuel-baremetal
           installer: fuel
-          <<: *fraser
-      - zte-pod2:
-          slave-label: '{pod}'
-          installer: daisy
-          <<: *master
-      - zte-pod2:
-          slave-label: '{pod}'
-          installer: daisy
-          <<: *fraser
-      - zte-pod3:
-          slave-label: '{pod}'
-          installer: daisy
           <<: *master
-      - zte-pod3:
-          slave-label: '{pod}'
-          installer: daisy
-          <<: *fraser
-      - zte-pod9:
-          slave-label: '{pod}'
-          installer: daisy
-          <<: *master
-      - zte-pod9:
-          slave-label: '{pod}'
-          installer: daisy
-          <<: *fraser
-    # -------------------------------
-    # PODs for verify jobs triggered by each patch upload
-    #   - ool-virtual1:
-    #       slave-label: '{pod}'
-    #       installer: apex
-    #       <<: *master
-    # -------------------------------
 
     testsuite:
       - 'suite':
           job-timeout: 60
       - 'daily':
-          job-timeout: 480
+          job-timeout: 600
 
     jobs:
       - 'functest-{installer}-{pod}-{testsuite}-{stream}'
@@ -219,6 +106,7 @@
       - throttle:
           enabled: true
           max-per-node: 1
+          max-total: 10
           option: 'project'
 
     wrappers:
@@ -237,7 +125,10 @@
       - 'functest-{testsuite}-parameter'
       - string:
           name: DEPLOY_SCENARIO
-          default: 'os-odl_l2-nofeature-ha'
+          default: 'os-nosdn-nofeature-noha'
+      - string:
+          name: DOCKER_TAG
+          default: ''
       - string:
           name: CLEAN_DOCKER_IMAGES
           default: 'false'
@@ -281,34 +172,40 @@
             - 'connection_check'
             - 'api_check'
             - 'snaps_health_check'
-            - 'vping_userdata'
             - 'vping_ssh'
-            - 'tempest_smoke_serial'
+            - 'vping_userdata'
+            - 'cinder_test'
+            - 'tempest_smoke'
             - 'rally_sanity'
+            - 'refstack_defcore'
+            - 'patrole'
             - 'odl'
-            - 'odl_netvirt'
             - 'snaps_smoke'
-            - 'refstack_defcore'
-            - 'promise'
-            - 'doctor'
+            - 'shaker'
+            - 'vmtp'
+            - 'neutron_trunk'
+            - 'doctor-notification'
             - 'bgpvpn'
-            - 'parser'
-            - 'security_scan'
-            - 'tempest_full_parallel'
+            - 'functest-odl-sfc'
+            - 'barometercollectd'
+            - 'fds'
+            - 'tempest_full'
             - 'rally_full'
             - 'cloudify_ims'
-            - 'cloudify_vrouter'
-            - 'orchestra_openims'
-            - 'orchestra_clearwaterims'
+            - 'vyos_vrouter'
+            - 'juju_epc'
+            - 'parser'
           default: 'connection_check'
       - choice:
           name: FUNCTEST_TIER
           choices:
             - 'healthcheck'
             - 'smoke'
+            - 'benchmarking'
             - 'features'
             - 'components'
             - 'vnf'
+            - 'parser'
           default: 'healthcheck'
       - string:
           name: TESTCASE_OPTIONS