X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Ffunctest%2Ffunctest-daily-jobs.yml;h=1f17a507ee904714cbec8b7a0c861be5dde64b18;hb=5203913e8e39ad20c26dee453a0217bcba902785;hp=79e5c15031327e5fbfaf44115ae2d19f22de8494;hpb=280ae93b3d91bbd84db9b7aa20f7f5513b8afd7e;p=releng.git

diff --git a/jjb/functest/functest-daily-jobs.yml b/jjb/functest/functest-daily-jobs.yml
index 79e5c1503..1f17a507e 100644
--- a/jjb/functest/functest-daily-jobs.yml
+++ b/jjb/functest/functest-daily-jobs.yml
@@ -244,12 +244,31 @@
     builders:
       - description-setter:
           description: "Built on $NODE_NAME"
-      - 'functest-{testsuite}-builder'
+      - 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'
 
 
 ########################
 # 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:
@@ -374,6 +393,23 @@
       - '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: