Merge lp:~canonical-platform-qa/qa-jenkins-jobs/ust-device-grafana into lp:qa-jenkins-jobs

[Allan LeSage]

Add device parameter for grafana reporting.

Missed device parameter in call to grafana syncing script.

[Allan LeSage (allanlesage)]

review: Approve

[platform-qa-bot (platform-qa-bot)]

review: Approve (continuous-integration)

=== modified file 'jobs/ubuntu-system-tests/jobs.yaml'
--- jobs/ubuntu-system-tests/jobs.yaml	2016-09-23 22:40:34 +0000
+++ jobs/ubuntu-system-tests/jobs.yaml	2016-09-23 22:58:19 +0000
@@ -151,6 +151,7 @@
             builders:
                 - report-results-to-grafana-builder:
                     setid: '{test_level}'
+                    device: '{device}'
 
 - job-template:
     <<: *UST_DEFAULT_JOB_TEMPLATE

=== modified file 'jobs/ubuntu-system-tests/report-results-to-grafana-builder.sh'
--- jobs/ubuntu-system-tests/report-results-to-grafana-builder.sh	2016-09-23 22:40:34 +0000
+++ jobs/ubuntu-system-tests/report-results-to-grafana-builder.sh	2016-09-23 22:58:19 +0000
@@ -12,4 +12,4 @@
 export MONGO_PORT=27017
 
 echo "Push to grafana"
-python3 qakit/prodenv/tests/sync_test_results.py -p $OUTPUTDIR/artifacts/test-results.pyunit -d krillin -c $CHANNEL -b $REVISION -s {setid}
+python3 qakit/prodenv/tests/sync_test_results.py -p $OUTPUTDIR/artifacts/test-results.pyunit -d {device} -c $CHANNEL -b $REVISION -s {setid}