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

diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml
index 3b3adabc2..e1f15fd93 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,61 +43,11 @@
       - baremetal:
           slave-label: fuel-baremetal
           installer: fuel
-          <<: *gambia
-      - virtual:
-          slave-label: fuel-virtual
-          installer: fuel
-          <<: *gambia
-      - 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
-      - arm-virtual:
-          slave-label: compass-arm-virtual
-          installer: compass
-          <<: *master
-      - baremetal:
-          slave-label: compass-baremetal
-          installer: compass
-          <<: *fraser
-      - virtual:
-          slave-label: compass-virtual
-          installer: compass
-          <<: *fraser
-      - arm-virtual:
-          slave-label: compass-arm-virtual
-          installer: compass
-          <<: *fraser
+          <<: *hunter
       # apex CI PODs
       - virtual:
           slave-label: apex-virtual-master
@@ -114,128 +60,29 @@
       - virtual:
           slave-label: apex-virtual-master
           installer: apex
-          <<: *gambia
+          <<: *hunter
       - baremetal:
           slave-label: apex-baremetal-master
           installer: apex
-          <<: *gambia
-      - virtual:
-          slave-label: apex-virtual-fraser
-          installer: apex
-          <<: *fraser
-      - baremetal:
-          slave-label: apex-baremetal-fraser
-          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
-          <<: *gambia
-      - armband-virtual:
-          slave-label: armband-virtual
-          installer: fuel
-          <<: *gambia
       - 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':
@@ -279,6 +126,9 @@
       - string:
           name: DEPLOY_SCENARIO
           default: 'os-nosdn-nofeature-noha'
+      - string:
+          name: DOCKER_TAG
+          default: ''
       - string:
           name: CLEAN_DOCKER_IMAGES
           default: 'false'