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

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 1f17a507e..a58e0bf3f 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -181,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}'
@@ -192,9 +197,9 @@
       - 'suite':
           job-timeout: 60
       - 'daily':
-          job-timeout: 300
+          job-timeout: 360
       - 'arm-daily':
-          job-timeout: 300
+          job-timeout: 360
 
     jobs:
       - 'functest-{installer}-{pod}-{testsuite}-{stream}'
@@ -244,31 +249,12 @@
     builders:
       - description-setter:
           description: "Built on $NODE_NAME"
-      - conditional-step:
-          condition-kind: regex-match
-          regex: "os-*"
-          label: 'DEPLOY_SCENARIO'
-          steps:
-            - 'functest-{testsuite}-builder'
-      - conditional-step:
-          condition-kind: regex-match
-          regex: "k8-*"
-          label: 'DEPLOY_SCENARIO'
-          steps:
-            - 'functest-k8-builder'
+      - 'functest-{testsuite}-builder'
 
 
 ########################
 # parameter macros
 ########################
-- parameter:
-    name: functest-k8-parameter
-    parameters:
-      - string:
-          name: FUNCTEST_MODE
-          default: 'daily'
-          description: "Daily suite name to run on K8 deployment"
-
 - parameter:
     name: functest-daily-parameter
     parameters:
@@ -393,32 +379,29 @@
       - 'functest-store-results'
       - 'functest-exit'
 
-- builder:
-    name: functest-k8-builder
-    builders:
-      - 'functest-cleanup'
-      - 'functest-daily-k8'
-      - 'functest-store-results'
-      - 'functest-exit'
-
-- builder:
-    name: functest-daily-k8
-    builders:
-      # yamllint disable rule:indentation
-      - shell:
-          !include-raw:
-              - ../../utils/fetch_k8_conf.sh
-              - ./functest-k8.sh
-
 - builder:
     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: