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

[Max Brustkern]

Add Grafana upload macro and add that builder to ubiquity jobs

This branch implements a macro for Grafana uploads and adds it to the ubiquity jobs.

[Sergio Cazzolato (sergio-j-cazzolato)]

I like it, approving

review: Approve

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

PASSED: Continuous integration, rev:196
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/72/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/233
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/233/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/231
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/231/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1542/console

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

review: Approve (continuous-integration)

=== modified file 'jobs/macros.yaml'
--- jobs/macros.yaml	2016-05-17 20:51:37 +0000
+++ jobs/macros.yaml	2017-01-31 19:03:39 +0000
@@ -18,7 +18,25 @@
             bsdtar -x -f {iso} -O \./.disk/info >> media_info
             echo >> media_info
             cat media_info
-            
+
+- builder:
+    name: grafana-upload
+    builders:
+        - shell: |
+            if [ -z "$BUILDSTAMP" ] ; then
+                BUILDSTAMP=$(grep -o '([0-9.]\+)' media_info | tr -d '()')
+            fi
+            bzr branch lp:custom-grafana-integration $WORKSPACE/grafana-integration
+            export GRAFANA_INTEGRATION_PATH=$WORKSPACE/grafana-integration
+            export MONGO_HOST=10.25.236.10
+            export MONGO_PORT=27017
+            export CARBON_SERVER=10.25.236.71
+            export CARBON_PORT=2003
+            export MSG_CHUNK_SIZE=300
+            export MSG_WAIT=60
+            ### Run grafana integration and send data to grafana server ###
+            $GRAFANA_INTEGRATION_PATH/run_script sync-tests -rt xunit -rf {xunit_file} -m tests_01 -t $(date +%s) -c {channel} -b $BUILDSTAMP -d {device}
+
 - publisher: # This publisher archives all job artifacts
     name: 'archive-artifacts'
     publishers:

=== modified file 'jobs/ubiquity/jobs.yaml'
--- jobs/ubiquity/jobs.yaml	2016-12-05 19:05:41 +0000
+++ jobs/ubiquity/jobs.yaml	2017-01-31 19:03:39 +0000
@@ -120,6 +120,10 @@
             ubiquity_branch: '{ubiquity_branch}'
         - generate-junit-files:
             source_dir: 'results/var/local/autopilot/junit'
+        - grafana-upload:
+            xunit_file: 'results/var/local/autopilot/junit/*.xml'
+            channel: '{flavor}-{release}-desktop-{arch}-pending'
+            device: 'vm'
     publishers:
         - archive-artifacts
         - junit: