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

[Francis Ginther]

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.

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/

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:1286
http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-ci/850/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-vivid-amd64-ci/85
    SUCCESS: http://jenkins.qa.ubuntu.com/job/cupstream2distro-config-vivid-i386-ci/85

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/cupstream2distro-config-ci/850/rebuild

review: Approve (continuous-integration)

[Para Siva (psivaa)]

review: Approve

=== modified file 'stacks/head/unity8.cfg'
--- stacks/head/unity8.cfg	2015-06-18 02:46:28 +0000
+++ stacks/head/unity8.cfg	2015-07-13 22:20:05 +0000
@@ -24,7 +24,7 @@
       test_packages: indicators-client unity-scope-tool unity8-autopilot unity8-doc unity8-fake-env unity8-private unity8
       archive_artifacts: '**/*test*.xml, **/coverage*.xml'
       publish_junit: '**/*test*.xml'
-      standard_jobs: generic-deb-autopilot-wily-touch
+      standard_jobs: generic-deb-autopilot-wily-touch unity-phablet-qmluitests-wily
       configurations:
         wily-i386:
           publish_junit: False
 
=== modified file 'stacks/vivid/sdk.cfg'
--- stacks/vivid/sdk.cfg	2015-06-30 08:58:55 +0000
+++ stacks/vivid/sdk.cfg	2015-07-13 22:20:05 +0000
@@ -53,6 +53,7 @@
      autolanding_template: False
    ubuntu-settings-components:
      autolanding_template: False
+     standard_jobs: ubuntu-settings-components-qmltests-vivid
      configurations:
        vivid-armhf:
           archive_artifacts: '**/output/*deb'
 
=== modified file 'stacks/vivid/unity8.cfg'
--- stacks/vivid/unity8.cfg	2015-06-09 15:28:14 +0000
+++ stacks/vivid/unity8.cfg	2015-07-13 22:20:05 +0000
@@ -25,7 +25,7 @@
       test_packages: indicators-client unity-scope-tool unity8-autopilot unity8-doc unity8-fake-env unity8-private unity8
       archive_artifacts: '**/*test*.xml, **/coverage*.xml'
       publish_junit: '**/*test*.xml'
-      standard_jobs: generic-deb-autopilot-vivid-touch
+      standard_jobs: generic-deb-autopilot-vivid-touch unity-phablet-qmluitests-vivid
       configurations:
         vivid-i386:
           publish_junit: False