Merge lp:~canonical-platform-qa/qa-jenkins-jobs/results-type-grafana-upload into lp:qa-jenkins-jobs

[Sergio Cazzolato]

Adding parameters to specify the results type in grafana upload builder

[lp:~canonical-platform-qa/qa-jenkins-jobs/results-type-grafana-upload]

220. By Sergio Cazzolato on 2017-02-09

changing the name for grafana upload builder

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

PASSED: Continuous integration, rev:219
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/89/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/262
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/262/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/260
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/260/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1578/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/89/rebuild

review: Approve (continuous-integration)

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

PASSED: Continuous integration, rev:220
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/90/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/263
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/263/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/261
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/261/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1579/console

Click here to trigger a rebuild:
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/90/rebuild

review: Approve (continuous-integration)

[Max Brustkern (nuclearbob)]

LGTM

review: Approve

[Max Brustkern (nuclearbob)]

I incorporated this here:
https://code.launchpad.net/~canonical-platform-qa/qa-jenkins-jobs/results-type-grafana-upload/+merge/316884
Not sure if we should mark this as prerequisite and land separately, or just work on that one.

[Max Brustkern (nuclearbob)]

Er, here: https://code.launchpad.net/~canonical-platform-qa/qa-jenkins-jobs/aut-grafana/+merge/316513

=== modified file 'jobs/macros.yaml'
--- jobs/macros.yaml	2017-02-08 17:57:51 +0000
+++ jobs/macros.yaml	2017-02-09 17:25:23 +0000
@@ -43,7 +43,7 @@
             EOF
 
 - builder:
-    name: grafana-upload
+    name: grafana-tests-upload
     builders:
         - grafana-setup:
         - shell: |
@@ -63,7 +63,7 @@
                 "build": "$BUILDSTAMP"
             }}
             EOF
-            $GRAFANA_INTEGRATION_PATH/run_script sync-tests -rt xunit -rf {xunit_file} -if global_info.json -m tests_01 -t $(date +%s)
+            $GRAFANA_INTEGRATION_PATH/run_script sync-tests -rt {results_type} -rf {results_file} -if global_info.json -m tests_01 -t $(date +%s)
 
 - publisher: # This publisher archives all job artifacts
     name: 'archive-artifacts'

=== modified file 'jobs/ubiquity/jobs.yaml'
--- jobs/ubiquity/jobs.yaml	2017-02-03 15:44:13 +0000
+++ jobs/ubiquity/jobs.yaml	2017-02-09 17:25:23 +0000
@@ -120,8 +120,9 @@
             ubiquity_branch: '{ubiquity_branch}'
         - generate-junit-files:
             source_dir: 'results/var/local/autopilot/junit'
-        - grafana-upload:
-            xunit_file: 'results/var/local/autopilot/junit/*.xml'
+        - grafana-tests-upload:
+            results_type: 'xunit'
+            results_file: 'results/var/local/autopilot/junit/*.xml'
             device: 'vm'
             model: ''
             os: '{flavor}'