X-Git-Url: https://gerrit.nordix.org/gitweb?a=blobdiff_plain;f=jjb%2Fengine%2Fperiodic-jobs%2Fengine-periodic-offline-deploy-test.yaml;h=39c575d80aafcc2304b5415e2cee59b22beaffc3;hb=refs%2Fchanges%2F59%2F4159%2F1;hp=e3e68c1f88b8faa2292ec37104f6b1660a1dbc20;hpb=8d3e682d48c4444d324e2a87d1e9939becc39e27;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 e3e68c1f..39c575d8 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:
@@ -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,15 @@
           option: project
 
     wrappers:
-      - build-timeout:
-          timeout: 550
+#      - build-timeout:
+#          timeout: 550
       - mask-passwords
       - fix-workspace-permissions
 
     builders:
       - description-setter:
           description: $PROVISIONER_TYPE | $INSTALLER_TYPE | $DEPLOY_SCENARIO
+      - 'download-artifact-macro'
       - multijob:
           name: "Offline Deployment on {type}"
           condition: SUCCESSFUL
@@ -162,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:
@@ -170,12 +173,10 @@
           option: project
 
     wrappers:
-      - build-timeout:
-          timeout: '{build-timeout}'
+#      - build-timeout:
+#          timeout: '{build-timeout}'
       - mask-passwords
       - fix-workspace-permissions
 
     builders:
-      - shell: |
-          #!/bin/bash
-          env
+      - '{phase}-macro'