X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-daily-jobs.yaml;h=45f1e0553b1bb574976b2539dc0c193510cf0c5c;hb=d3ad6ecbba971d0b87778bc9227684e85ff5e1cd;hp=9262988e181c09253d0bf076cf3368a61d287754;hpb=2d45d3ab8789ab74be79c1179dd3b773a2490f9a;p=releng.git

diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml
index 9262988e1..45f1e0553 100644
--- a/jjb/functest/functest-daily-jobs.yaml
+++ b/jjb/functest/functest-daily-jobs.yaml
@@ -14,10 +14,6 @@
       stream: master
       branch: '{stream}'
       gs-pathname: ''
-    fraser: &fraser
-      stream: fraser
-      branch: 'stable/{stream}'
-      gs-pathname: '/{stream}'
     gambia: &gambia
       stream: gambia
       branch: 'stable/{stream}'
@@ -47,45 +43,20 @@
       - 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
+          <<: *hunter
       # compass CI PODs
       - baremetal:
           slave-label: compass-baremetal
           installer: compass
-          <<: *master
+          <<: *gambia
       - virtual:
           slave-label: compass-virtual
           installer: compass
-          <<: *master
-      - baremetal:
-          slave-label: compass-baremetal
-          installer: compass
-          <<: *fraser
-      - virtual:
-          slave-label: compass-virtual
-          installer: compass
-          <<: *fraser
+          <<: *gambia
       # apex CI PODs
       - virtual:
           slave-label: apex-virtual-master
@@ -96,120 +67,36 @@
           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
+          <<: *hunter
+      - virtual:
+          slave-label: apex-virtual-master
           installer: apex
-          <<: *fraser
+          <<: *gambia
+      - baremetal:
+          slave-label: apex-baremetal-master
+          installer: apex
+          <<: *gambia
       # 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
-      - zte-pod1:
-          slave-label: '{pod}'
-          installer: fuel
-          <<: *master
-      - zte-pod1:
-          slave-label: '{pod}'
-          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
-    # -------------------------------
+          <<: *hunter
 
     testsuite:
       - 'suite':
           job-timeout: 60
       - 'daily':
-          job-timeout: 480
+          job-timeout: 600
 
     jobs:
       - 'functest-{installer}-{pod}-{testsuite}-{stream}'
@@ -227,6 +114,7 @@
       - throttle:
           enabled: true
           max-per-node: 1
+          max-total: 10
           option: 'project'
 
     wrappers:
@@ -246,6 +134,9 @@
       - string:
           name: DEPLOY_SCENARIO
           default: 'os-nosdn-nofeature-noha'
+      - string:
+          name: DOCKER_TAG
+          default: ''
       - string:
           name: CLEAN_DOCKER_IMAGES
           default: 'false'