X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-daily-jobs.yaml;h=3f5e7fd12642a0b6bce575eca362954b53cd5d88;hb=3ecb0c33570d1b37a2034db84c499fcc3a95012b;hp=9262988e181c09253d0bf076cf3368a61d287754;hpb=10a5e72757214957dd4d01c9f9a38cea7948502f;p=releng.git

diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml
index 9262988e1..3f5e7fd12 100644
--- a/jjb/functest/functest-daily-jobs.yaml
+++ b/jjb/functest/functest-daily-jobs.yaml
@@ -14,12 +14,8 @@
       stream: master
       branch: '{stream}'
       gs-pathname: ''
-    fraser: &fraser
-      stream: fraser
-      branch: 'stable/{stream}'
-      gs-pathname: '/{stream}'
-    gambia: &gambia
-      stream: gambia
+    iruya: &iruya
+      stream: iruya
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
     hunter: &hunter
@@ -47,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
@@ -96,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}'
@@ -227,6 +106,7 @@
       - throttle:
           enabled: true
           max-per-node: 1
+          max-total: 10
           option: 'project'
 
     wrappers:
@@ -246,6 +126,9 @@
       - string:
           name: DEPLOY_SCENARIO
           default: 'os-nosdn-nofeature-noha'
+      - string:
+          name: DOCKER_TAG
+          default: ''
       - string:
           name: CLEAN_DOCKER_IMAGES
           default: 'false'
@@ -301,11 +184,6 @@
             - 'shaker'
             - 'vmtp'
             - 'neutron_trunk'
-            - 'doctor-notification'
-            - 'bgpvpn'
-            - 'functest-odl-sfc'
-            - 'barometercollectd'
-            - 'fds'
             - 'tempest_full'
             - 'rally_full'
             - 'cloudify_ims'
@@ -319,7 +197,6 @@
             - 'healthcheck'
             - 'smoke'
             - 'benchmarking'
-            - 'features'
             - 'components'
             - 'vnf'
             - 'parser'