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

[Max Brustkern]

Fix issues and move grafana upload to post-build step

This branch moves grafana upload to a post-build step so it should still run if tests fail. A couple other small job issues are also addressed.

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

PASSED: Continuous integration, rev:214
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/95/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/278
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-amd64-package/278/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/276
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-xenial-i386-package/276/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/1600/console

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

review: Approve (continuous-integration)

[Sergio Cazzolato (sergio-j-cazzolato)]

Code lgtm

review: Approve

=== modified file 'jobs/auto-upgrade-testing/jobs.yaml'
--- jobs/auto-upgrade-testing/jobs.yaml	2017-02-10 14:55:05 +0000
+++ jobs/auto-upgrade-testing/jobs.yaml	2017-02-13 16:23:24 +0000
@@ -71,18 +71,18 @@
             cd auto-upgrade-testing
 
             set +e
-            sudo python3 -m upgrade_testing.command_line -c $PROFILE --provision --results-dir "$WORKSPACE/ubuntu-trusty-xenial-basic-amd64_qemu/"
+            sudo python3 -m upgrade_testing.command_line -c $PROFILE --provision --results-dir "$WORKSPACE/{profile}/"
             EXITSTATUS=$?
-            cp $WORKSPACE/ubuntu-trusty-xenial-basic-amd64_qemu/*/artifacts/upgrade_run/junit.xml $WORKSPACE/junit.xml
+            cp $WORKSPACE/{profile}/*/artifacts/upgrade_run/junit.xml $WORKSPACE/junit.xml
             exit $EXITSTATUS
-        - grafana-tests-upload:
-            results_type: 'xunit'
-            results_file: 'junit.xml'
-            info_file: 'global_info.json'
     publishers:
         - postbuildscript:
             builders:
-              - shell: 'sudo chown -R $USER:$USER "$WORKSPACE/{profile}"'
+                - shell: 'sudo chown -R $USER:$USER "$WORKSPACE/{profile}"'
+                - grafana-tests-upload:
+                    results_type: 'xunit'
+                    results_file: 'junit.xml'
+                    info_file: 'global_info.json'
             script-only-if-succeeded: False
             script-only-if-failed: False
         - archive:
 
=== modified file 'jobs/iso-testing/jobs.yaml'
--- jobs/iso-testing/jobs.yaml	2017-02-08 21:04:16 +0000
+++ jobs/iso-testing/jobs.yaml	2017-02-13 16:23:24 +0000
@@ -479,11 +479,11 @@
             project-name: 'qakit'
         - grafana-setup
         - shell: |
-            #!/bin/bash
+            #!/bin/bash -ex
+            export OUTPUTDIR=$WORKSPACE/results
             mkdir -p $OUTPUTDIR
-            export OUTPUTDIR=$WORKSPACE/results
+            export DATADIR=/data/footprint/{flavor}-{release}-desktop-{arch}
             mkdir -p $DATADIR
-            export DATADIR=/data/footprint/{flavor}-{release}-desktop-{arch}
 
             echo "Getting build id"
             ISO="/data/iso/{flavor}/{release}-desktop-{arch}.iso"
 
=== modified file 'jobs/ubiquity/jobs.yaml'
--- jobs/ubiquity/jobs.yaml	2017-02-09 19:15:16 +0000
+++ jobs/ubiquity/jobs.yaml	2017-02-13 16:23:24 +0000
@@ -127,12 +127,16 @@
             release: '{release}'
             arch: '{arch}'
             class: 'ubiquity'
-        - grafana-tests-upload:
-            results_type: 'xunit'
-            results_file: 'results/var/local/autopilot/junit/*.xml'
-            info_file: 'global_info.json'
 
     publishers:
         - archive-artifacts
         - junit:
             results: 'results/var/local/autopilot/junit/*.xml'
+        - postbuildscript:
+            builders:
+                - grafana-tests-upload:
+                    results_type: 'xunit'
+                    results_file: 'results/var/local/autopilot/junit/*.xml'
+                    info_file: 'global_info.json'
+            script-only-if-succeeded: False
+            script-only-if-failed: False