X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-daily-jobs.yml;h=ae226b6654a16f18ac6a1e8b33245d7c35e36c67;hb=4ee0e0934a6181866cdea70a9bb0c05728e31c7f;hp=79e5c15031327e5fbfaf44115ae2d19f22de8494;hpb=bd73235d8f53662f5048e8a2e9e79c343619229d;p=releng.git

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 79e5c1503..ae226b665 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -14,8 +14,8 @@
       stream: master
       branch: '{stream}'
       gs-pathname: ''
-    euphrates: &euphrates
-      stream: euphrates
+    fraser: &fraser
+      stream: fraser
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
     # -------------------------------
@@ -39,11 +39,11 @@
       - baremetal:
           slave-label: fuel-baremetal
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: fuel-virtual
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       # joid CI PODs
       - baremetal:
           slave-label: joid-baremetal
@@ -56,11 +56,11 @@
       - baremetal:
           slave-label: joid-baremetal
           installer: joid
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: joid-virtual
           installer: joid
-          <<: *euphrates
+          <<: *fraser
       # compass CI PODs
       - baremetal:
           slave-label: compass-baremetal
@@ -73,11 +73,11 @@
       - baremetal:
           slave-label: compass-baremetal
           installer: compass
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: compass-virtual
           installer: compass
-          <<: *euphrates
+          <<: *fraser
       # apex CI PODs
       - virtual:
           slave-label: apex-virtual-master
@@ -88,13 +88,13 @@
           installer: apex
           <<: *master
       - virtual:
-          slave-label: apex-virtual-euphrates
+          slave-label: apex-virtual-fraser
           installer: apex
-          <<: *euphrates
+          <<: *fraser
       - baremetal:
-          slave-label: apex-baremetal-euphrates
+          slave-label: apex-baremetal-fraser
           installer: apex
-          <<: *euphrates
+          <<: *fraser
       # armband CI PODs
       - armband-baremetal:
           slave-label: armband-baremetal
@@ -107,11 +107,11 @@
       - armband-baremetal:
           slave-label: armband-baremetal
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       - armband-virtual:
           slave-label: armband-virtual
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       # daisy CI PODs
       - baremetal:
           slave-label: daisy-baremetal
@@ -124,11 +124,11 @@
       - baremetal:
           slave-label: daisy-baremetal
           installer: daisy
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: daisy-virtual
           installer: daisy
-          <<: *euphrates
+          <<: *fraser
       # netvirt 3rd party ci
       - virtual:
           slave-label: odl-netvirt-virtual
@@ -164,7 +164,7 @@
       - zte-pod1:
           slave-label: '{pod}'
           installer: fuel
-          <<: *euphrates
+          <<: *fraser
       - zte-pod2:
           slave-label: '{pod}'
           installer: daisy
@@ -172,7 +172,7 @@
       - zte-pod2:
           slave-label: '{pod}'
           installer: daisy
-          <<: *euphrates
+          <<: *fraser
       - zte-pod3:
           slave-label: '{pod}'
           installer: daisy
@@ -180,7 +180,16 @@
       - zte-pod3:
           slave-label: '{pod}'
           installer: daisy
-          <<: *euphrates
+          <<: *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}'
@@ -192,9 +201,9 @@
       - 'suite':
           job-timeout: 60
       - 'daily':
-          job-timeout: 300
+          job-timeout: 360
       - 'arm-daily':
-          job-timeout: 300
+          job-timeout: 480
 
     jobs:
       - 'functest-{installer}-{pod}-{testsuite}-{stream}'
@@ -378,11 +387,25 @@
     name: functest-daily
     builders:
       # yamllint disable rule:indentation
-      - shell:
-          !include-raw:
-              - ./functest-env-presetup.sh
-              - ../../utils/fetch_os_creds.sh
-              - ./functest-alpine.sh
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "os-.*"
+          label: '$DEPLOY_SCENARIO'
+          steps:
+            - shell:
+                !include-raw:
+                    - ./functest-env-presetup.sh
+                    - ../../utils/fetch_os_creds.sh
+                    - ./functest-alpine.sh
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "k8-.*"
+          label: '$DEPLOY_SCENARIO'
+          steps:
+            - shell:
+                !include-raw:
+                    - ../../utils/fetch_k8_conf.sh
+                    - ./functest-k8.sh
 
 # yamllint enable rule:indentation
 - builder: