Merge lp:~fginther/cupstream2distro-config/re-enable-vm-based-jobs into lp:cupstream2distro-config

Proposed by Francis Ginther
Status: Merged
Approved by: Francis Ginther
Approved revision: 1286
Merged at revision: 1286
Proposed branch: lp:~fginther/cupstream2distro-config/re-enable-vm-based-jobs
Merge into: lp:cupstream2distro-config
Diff against target: 37 lines (+3/-2)
3 files modified
stacks/head/unity8.cfg (+1/-1)
stacks/vivid/sdk.cfg (+1/-0)
stacks/vivid/unity8.cfg (+1/-1)
To merge this branch: bzr merge lp:~fginther/cupstream2distro-config/re-enable-vm-based-jobs
Reviewer Review Type Date Requested Status
Para Siva (community) Approve
PS Jenkins bot continuous-integration Approve
Review via email: mp+264652@code.launchpad.net

Commit message

Re-enable VM based jobs: unity-phablet-qmluitests-vivid, unity-phablet-qmluitests-wily, and ubuntu-settings-components-qmltests-vivid, reverting the changes made in revno 1280.

Description of the change

Re-enable VM based jobs: unity-phablet-qmluitests-vivid, unity-phablet-qmluitests-wily, and ubuntu-settings-components-qmltests-vivid, reverting the changes made in revno 1280.

These jobs are examples:
 - http://s-jenkins.ubuntu-ci:8080/job/ubuntu-settings-components-qmltests-vivid/37/
 - http://s-jenkins.ubuntu-ci:8080/job/unity-phablet-qmluitests-wily/58/
 - http://s-jenkins.ubuntu-ci:8080/job/unity-phablet-qmluitests-vivid/892/

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)
Revision history for this message
Para Siva (psivaa) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'stacks/head/unity8.cfg'
2--- stacks/head/unity8.cfg 2015-06-18 02:46:28 +0000
3+++ stacks/head/unity8.cfg 2015-07-13 22:20:05 +0000
4@@ -24,7 +24,7 @@
5 test_packages: indicators-client unity-scope-tool unity8-autopilot unity8-doc unity8-fake-env unity8-private unity8
6 archive_artifacts: '**/*test*.xml, **/coverage*.xml'
7 publish_junit: '**/*test*.xml'
8- standard_jobs: generic-deb-autopilot-wily-touch
9+ standard_jobs: generic-deb-autopilot-wily-touch unity-phablet-qmluitests-wily
10 configurations:
11 wily-i386:
12 publish_junit: False
13
14=== modified file 'stacks/vivid/sdk.cfg'
15--- stacks/vivid/sdk.cfg 2015-06-30 08:58:55 +0000
16+++ stacks/vivid/sdk.cfg 2015-07-13 22:20:05 +0000
17@@ -53,6 +53,7 @@
18 autolanding_template: False
19 ubuntu-settings-components:
20 autolanding_template: False
21+ standard_jobs: ubuntu-settings-components-qmltests-vivid
22 configurations:
23 vivid-armhf:
24 archive_artifacts: '**/output/*deb'
25
26=== modified file 'stacks/vivid/unity8.cfg'
27--- stacks/vivid/unity8.cfg 2015-06-09 15:28:14 +0000
28+++ stacks/vivid/unity8.cfg 2015-07-13 22:20:05 +0000
29@@ -25,7 +25,7 @@
30 test_packages: indicators-client unity-scope-tool unity8-autopilot unity8-doc unity8-fake-env unity8-private unity8
31 archive_artifacts: '**/*test*.xml, **/coverage*.xml'
32 publish_junit: '**/*test*.xml'
33- standard_jobs: generic-deb-autopilot-vivid-touch
34+ standard_jobs: generic-deb-autopilot-vivid-touch unity-phablet-qmluitests-vivid
35 configurations:
36 vivid-i386:
37 publish_junit: False

Subscribers

People subscribed via source and target branches

to all changes: