X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fperiodic-jobs%2Fengine-periodic-offline-deploy-test.yaml;h=5dd5fcf1c4ab60c468f6304ade55bea79de43fb9;hb=f2a22856ce312346f2afacfcd4780c2fd0cf96eb;hp=5a77c400aa3bdf7ce81e30d835d213f77e6540b6;hpb=299841ac0e55baa3f49aab1e0e55d353fe1d75ca;p=infra%2Fcicd.git

diff --git a/jjb/engine/periodic-jobs/engine-periodic-offline-deploy-test.yaml b/jjb/engine/periodic-jobs/engine-periodic-offline-deploy-test.yaml
index 5a77c400..5dd5fcf1 100644
--- a/jjb/engine/periodic-jobs/engine-periodic-offline-deploy-test.yaml
+++ b/jjb/engine/periodic-jobs/engine-periodic-offline-deploy-test.yaml
@@ -40,7 +40,7 @@
           provisioner-type: bifrost
           installer-type: kubespray
           slave-label: baremetal-deploy
-          yardstick-dispatcher: 'influxdb'
+          yardstick-dispatcher: 'file'
 
     environment-type:
       - offline:
@@ -51,11 +51,11 @@
 
     phase:
       - deploy:
-          build-timeout: 90
+          build-timeout: 60
       - functest:
-          build-timeout: 240
+          build-timeout: 210
       - yardstick:
-          build-timeout: 120
+          build-timeout: 30
 
     jobs:
       - '{deploy-scenario}-{environment-type}-{distro}-{type}-periodic'
@@ -95,22 +95,6 @@
           name: IDF
           default: '{idf}/${{NODE_NAME}}-idf.yml'
           description: 'IDF file to use for deployment'
-      - string:
-          name: TEST_REPO_URL
-          default: 'https://gerrit.nordix.org/infra/test.git'
-          description: 'URL to clone the test repo from'
-      - string:
-          name: TEST_FW
-          default: 'functest'
-          description: 'Test framework to use'
-      - string:
-          name: TEST_SUITE
-          default: 'smoke'
-          description: 'Test suite to run'
-      - string:
-          name: YARDSTICK_DISPATCHER
-          default: '{yardstick-dispatcher}'
-          description: 'Dispatcher to use for Yardstick reporting'
 
     properties:
       - logrotate
@@ -120,14 +104,14 @@
           option: project
 
     wrappers:
-#      - build-timeout:
-#          timeout: 550
+      - build-timeout:
+          timeout: 300
       - mask-passwords
       - fix-workspace-permissions
 
     builders:
       - description-setter:
-          description: $PROVISIONER_TYPE | $INSTALLER_TYPE | $DEPLOY_SCENARIO
+          description: $DEPLOY_SCENARIO | $PROVISIONER_TYPE | $INSTALLER_TYPE
       - 'download-artifact-macro'
       - multijob:
           name: "Offline Deployment on {type}"
@@ -163,6 +147,24 @@
 
     disabled: '{obj:disabled}'
 
+    parameters:
+      - string:
+          name: TEST_REPO_URL
+          default: 'https://gerrit.nordix.org/infra/test.git'
+          description: 'URL to clone the test repo from'
+      - string:
+          name: TEST_FW
+          default: '{phase}'
+          description: 'Test framework to use'
+      - string:
+          name: TEST_SUITE
+          default: 'smoke'
+          description: 'Test suite to run'
+      - string:
+          name: YARDSTICK_DISPATCHER
+          default: '{yardstick-dispatcher}'
+          description: 'Dispatcher to use for Yardstick reporting'
+
     properties:
       - logrotate
       - throttle:
@@ -171,10 +173,12 @@
           option: project
 
     wrappers:
-#      - build-timeout:
-#          timeout: '{build-timeout}'
+      - build-timeout:
+          timeout: '{build-timeout}'
       - mask-passwords
       - fix-workspace-permissions
 
     builders:
+      - description-setter:
+          description: $DEPLOY_SCENARIO | $PROVISIONER_TYPE | $INSTALLER_TYPE
       - '{phase}-macro'