Merge lp:~canonical-platform-qa/qa-jenkins-jobs/separate-subunit-to-junit-builder into lp:qa-jenkins-jobs

[Allan LeSage]

Perform subunit-to-junit conversion in a separate builder.

subunit in the archive won't translate subunit skipped tests to junit skipped tests, literally inserting 'skip' instead of 'skipped' in the XML; the remedy is to get the freshest subunit via PyPi, this MP breaks the subunit2junit step into its own builder downstream of the build proper to accomplish such.

[Max Brustkern (nuclearbob)]

LGTM

review: Approve

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

FAILED: Autolanding.
No commit message was specified in the merge proposal. Hit 'Add commit message' on the merge proposal web page or follow the link below. You can approve the merge proposal yourself to rerun.
https://code.launchpad.net/~canonical-platform-qa/qa-jenkins-jobs/separate-subunit-to-junit-builder/+merge/297571/+edit-commit-message

review: Needs Fixing (continuous-integration)

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

FAILED: Continuous integration, rev:52
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~canonical-platform-qa/qa-jenkins-jobs/separate-subunit-to-junit-builder/+merge/297571/+edit-commit-message

https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/1/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/368
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/368/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/368
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/368/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/323/console

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

review: Needs Fixing (continuous-integration)

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

PASSED: Continuous integration, rev:52
https://platform-qa-jenkins.ubuntu.com/job/qa-jenkins-jobs-ci/7/
Executed test runs:
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/377
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-amd64-package/377/artifact/work/output/*zip*/output.zip
    SUCCESS: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/377
        deb: https://platform-qa-jenkins.ubuntu.com/job/build-wily-i386-package/377/artifact/work/output/*zip*/output.zip
    None: https://platform-qa-jenkins.ubuntu.com/job/generic-update-mp/331/console

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

review: Approve (continuous-integration)

=== modified file 'jobs/ubuntu-system-tests/jobs.yaml'
--- jobs/ubuntu-system-tests/jobs.yaml	2016-06-02 22:35:43 +0000
+++ jobs/ubuntu-system-tests/jobs.yaml	2016-06-15 22:54:36 +0000
@@ -83,6 +83,7 @@
         - clear-artifacts
         - flash-device-builder
         - ubuntu-system-tests-builder
+        - subunit-to-junit-results-builder
     publishers:
         - archive:
             artifacts: 'results/**/*'
@@ -177,6 +178,12 @@
         - shell:
             !include-raw: 'ubuntu-system-tests-builder.sh'
 
+- builder:
+    name: subunit-to-junit-results-builder
+    builders:
+        - shell:
+            !include-raw: 'subunit-to-junit.sh'
+
 - job-template:
     name: 'ust_report-results-to-practitest'
     parameters:

=== added file 'jobs/ubuntu-system-tests/subunit-to-junit.sh'
--- jobs/ubuntu-system-tests/subunit-to-junit.sh	1970-01-01 00:00:00 +0000
+++ jobs/ubuntu-system-tests/subunit-to-junit.sh	2016-06-15 22:54:36 +0000
@@ -0,0 +1,10 @@
+
+virtualenv --python=python3 ve3
+. ve3/bin/activate
+
+pip3 install subunit
+pip3 install junitxml
+
+subunit2junitxml $WORKSPACE/results/artifacts/test-results.subunit > $WORKSPACE/results/artifacts/test-results.xml
+
+deactivate # our virtualenv

=== modified file 'scripts/ubuntu-system-tests/run-ubuntu-system-tests.sh'
--- scripts/ubuntu-system-tests/run-ubuntu-system-tests.sh	2016-05-13 10:13:39 +0000
+++ scripts/ubuntu-system-tests/run-ubuntu-system-tests.sh	2016-06-15 22:54:36 +0000
@@ -8,21 +8,11 @@
 virtualenv --python=python3 ve3
 . ve3/bin/activate
 
-# uci-config is broken in trusty ppa
-rm -rf uci-config
-bzr branch lp:uci-config
-CURDIR=`pwd`
-cd uci-config
-python3 setup.py install
-cd $CURDIR
-
 rm -rf ubuntu-system-tests
 bzr branch $UBUNTU_SYSTEM_TESTS_BRANCH ubuntu-system-tests
 cd ubuntu-system-tests
+
 python3 setup.py develop
 python3 -m ubuntu_system_tests.run -n -d -p -u -v --config=$CONFIG_PATH "$TESTS"
 
 deactivate # our virtualenv
-
-# TODO: run this as a post-build step
-subunit2junitxml $WORKSPACE/results/artifacts/test-results.subunit > $WORKSPACE/results/artifacts/test-results.xml || true