Enable InfluxDB reporting for Yardstick on baremetal

Change-Id: I1bb74f445ff25204f85a96f95e39486b244bf4e2

diff --git a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
index 5cf2eace88c70d1497d6b5aac8096ee70e2cfe99..8bddd1fa51a62b97ed58e3c7ebbaba0ff7a36ffe 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
+++ b/jjb/cloud-infra/cloud-infra-periodic-engine.yaml
@@ -62,8 +62,10 @@
     type:
       - virtual:
           slave-label: 'vpod-deploy-city'
+          yardstick-dispatcher: 'file'
       - baremetal:
           slave-label: 'baremetal-deploy'
+          yardstick-dispatcher: 'influxdb'
 
     phase:
       - deploy:
@@ -127,6 +129,10 @@
           name: TEST_SUITE
           default: 'smoke'
           description: 'Test suite to run'
+      - string:
+          name: YARDSTICK_DISPATCHER
+          default: '{yardstick-dispatcher}'
+          description: 'Dispatcher to use for Yardstick reporting'
       - string:
           name: CLEANUP
           default: 'true'
@@ -208,6 +214,7 @@
                 DEPLOY_TYPE=$DEPLOY_TYPE
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 TEST_SUITE=$TEST_SUITE
+                YARDSTICK_DISPATCHER=$YARDSTICK_DISPATCHER
                 CLEANUP=$CLEANUP
               node-parameters: true
               kill-phase-on: NEVER
@@ -271,6 +278,10 @@
           name: TEST_REPO_URL
           default: 'https://gerrit.nordix.org/infra/test.git'
           description: 'URL to Nordix Cloud Infra test repository'
+      - string:
+          name: YARDSTICK_DISPATCHER
+          default: 'file'
+          description: 'Dispatcher to use for Yardstick reporting'
       - string:
           name: CLEANUP
           default: 'false'

diff --git a/jjb/cloud-infra/cloud-infra-test.sh b/jjb/cloud-infra/cloud-infra-test.sh
index 2b85f0ddbd81f93dd55de6d73d0a3d88657fe678..d74f47a0edd457516d5b8a815ee71b86ee9a5550 100644 (file)
--- a/jjb/cloud-infra/cloud-infra-test.sh
+++ b/jjb/cloud-infra/cloud-infra-test.sh
@@ -30,6 +30,6 @@ set -o pipefail
 
 # execute cloud engine test.sh script with arguments
 cd $WORKSPACE
-./test/test.sh -c -f $TEST_FW -t $TEST_SUITE -s $DEPLOY_SCENARIO
+./test/test.sh -c -f $TEST_FW -t $TEST_SUITE -s $DEPLOY_SCENARIO -d $YARDSTICK_DISPATCHER
 
 # vim: set ts=2 sw=2 expandtab: