X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-daily-jobs.yml;h=a58e0bf3fb8d61c656daa27ec137456249d0a388;hb=47615f65f9c90b4d7523b4104d04b057b90d40f7;hp=2fc70b9162f62f34feeb3af6342a26d18701b586;hpb=f16e0889a0d50bef4a46a849de08c1cd5fc9dd11;p=releng.git

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 2fc70b916..a58e0bf3f 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -14,12 +14,10 @@
       stream: master
       branch: '{stream}'
       gs-pathname: ''
-      docker-tag: 'latest'
     euphrates: &euphrates
       stream: euphrates
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
-      docker-tag: 'stable'
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
@@ -183,6 +181,11 @@
           slave-label: '{pod}'
           installer: daisy
           <<: *euphrates
+      - zte-pod9:
+          slave-label: '{pod}'
+          installer: daisy
+          <<: *master
+    # -------------------------------
     # PODs for verify jobs triggered by each patch upload
     #   - ool-virtual1:
     #       slave-label: '{pod}'
@@ -194,9 +197,9 @@
       - 'suite':
           job-timeout: 60
       - 'daily':
-          job-timeout: 240
+          job-timeout: 360
       - 'arm-daily':
-          job-timeout: 240
+          job-timeout: 360
 
     jobs:
       - 'functest-{installer}-{pod}-{testsuite}-{stream}'
@@ -233,10 +236,6 @@
       - string:
           name: DEPLOY_SCENARIO
           default: 'os-odl_l2-nofeature-ha'
-      - string:
-          name: DOCKER_TAG
-          default: '{docker-tag}'
-          description: 'Tag to pull docker image'
       - string:
           name: CLEAN_DOCKER_IMAGES
           default: 'false'
@@ -384,11 +383,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:
@@ -399,8 +412,7 @@
           !include-raw:
               - ./functest-env-presetup.sh
               - ../../utils/fetch_os_creds.sh
-              - ./set-functest-env.sh
-              - ./functest-loop.sh
+              - ./functest-alpine.sh
 
 # yamllint enable rule:indentation
 - builder: