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

Proposed by Max Brustkern
Status: Merged
Approved by: Sergio Cazzolato
Approved revision: 214
Merged at revision: 212
Proposed branch: lp:~canonical-platform-qa/qa-jenkins-jobs/grafana-post-build
Merge into: lp:qa-jenkins-jobs
Diff against target: 73 lines (+18/-14)
3 files modified
jobs/auto-upgrade-testing/jobs.yaml (+7/-7)
jobs/iso-testing/jobs.yaml (+3/-3)
jobs/ubiquity/jobs.yaml (+8/-4)
To merge this branch: bzr merge lp:~canonical-platform-qa/qa-jenkins-jobs/grafana-post-build
Reviewer Review Type Date Requested Status
Sergio Cazzolato Approve
platform-qa-bot continuous-integration Approve
Review via email: mp+317126@code.launchpad.net

Commit message

Fix issues and move grafana upload to post-build step

Description of the change

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.

To post a comment you must log in.
Revision history for this message
platform-qa-bot (platform-qa-bot) wrote :
review: Approve (continuous-integration)
Revision history for this message
Sergio Cazzolato (sergio-j-cazzolato) wrote :

Code lgtm

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'jobs/auto-upgrade-testing/jobs.yaml'
2--- jobs/auto-upgrade-testing/jobs.yaml 2017-02-10 14:55:05 +0000
3+++ jobs/auto-upgrade-testing/jobs.yaml 2017-02-13 16:23:24 +0000
4@@ -71,18 +71,18 @@
5 cd auto-upgrade-testing
6
7 set +e
8- sudo python3 -m upgrade_testing.command_line -c $PROFILE --provision --results-dir "$WORKSPACE/ubuntu-trusty-xenial-basic-amd64_qemu/"
9+ sudo python3 -m upgrade_testing.command_line -c $PROFILE --provision --results-dir "$WORKSPACE/{profile}/"
10 EXITSTATUS=$?
11- cp $WORKSPACE/ubuntu-trusty-xenial-basic-amd64_qemu/*/artifacts/upgrade_run/junit.xml $WORKSPACE/junit.xml
12+ cp $WORKSPACE/{profile}/*/artifacts/upgrade_run/junit.xml $WORKSPACE/junit.xml
13 exit $EXITSTATUS
14- - grafana-tests-upload:
15- results_type: 'xunit'
16- results_file: 'junit.xml'
17- info_file: 'global_info.json'
18 publishers:
19 - postbuildscript:
20 builders:
21- - shell: 'sudo chown -R $USER:$USER "$WORKSPACE/{profile}"'
22+ - shell: 'sudo chown -R $USER:$USER "$WORKSPACE/{profile}"'
23+ - grafana-tests-upload:
24+ results_type: 'xunit'
25+ results_file: 'junit.xml'
26+ info_file: 'global_info.json'
27 script-only-if-succeeded: False
28 script-only-if-failed: False
29 - archive:
30
31=== modified file 'jobs/iso-testing/jobs.yaml'
32--- jobs/iso-testing/jobs.yaml 2017-02-08 21:04:16 +0000
33+++ jobs/iso-testing/jobs.yaml 2017-02-13 16:23:24 +0000
34@@ -479,11 +479,11 @@
35 project-name: 'qakit'
36 - grafana-setup
37 - shell: |
38- #!/bin/bash
39+ #!/bin/bash -ex
40+ export OUTPUTDIR=$WORKSPACE/results
41 mkdir -p $OUTPUTDIR
42- export OUTPUTDIR=$WORKSPACE/results
43+ export DATADIR=/data/footprint/{flavor}-{release}-desktop-{arch}
44 mkdir -p $DATADIR
45- export DATADIR=/data/footprint/{flavor}-{release}-desktop-{arch}
46
47 echo "Getting build id"
48 ISO="/data/iso/{flavor}/{release}-desktop-{arch}.iso"
49
50=== modified file 'jobs/ubiquity/jobs.yaml'
51--- jobs/ubiquity/jobs.yaml 2017-02-09 19:15:16 +0000
52+++ jobs/ubiquity/jobs.yaml 2017-02-13 16:23:24 +0000
53@@ -127,12 +127,16 @@
54 release: '{release}'
55 arch: '{arch}'
56 class: 'ubiquity'
57- - grafana-tests-upload:
58- results_type: 'xunit'
59- results_file: 'results/var/local/autopilot/junit/*.xml'
60- info_file: 'global_info.json'
61
62 publishers:
63 - archive-artifacts
64 - junit:
65 results: 'results/var/local/autopilot/junit/*.xml'
66+ - postbuildscript:
67+ builders:
68+ - grafana-tests-upload:
69+ results_type: 'xunit'
70+ results_file: 'results/var/local/autopilot/junit/*.xml'
71+ info_file: 'global_info.json'
72+ script-only-if-succeeded: False
73+ script-only-if-failed: False

Subscribers

People subscribed via source and target branches