Merge lp:~psivaa/cupstream2distro-config/mir-touch-standard into lp:cupstream2distro-config

[Para Siva]

Make mir-mediumtests-xenial-touch a standard job.

Make mir-mediumtests-xenial-touch a standard job.

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Francis Ginther (fginther)]

This looks good. The mir configuration in stacks/wily/mir.cfg needs some work (it should probably match lp:mir exactly except for the target_branch), but that can be done with another MP.

review: Approve

[Para Siva (psivaa)]

I'll go ahead and merge this and work on another MP for wily/mir.cfg

=== modified file 'stacks/dev/mir.cfg'
--- stacks/dev/mir.cfg	2015-12-01 19:15:15 +0000
+++ stacks/dev/mir.cfg	2015-12-16 16:44:03 +0000
@@ -20,8 +20,6 @@
       publish_junit: '**/results/*test*.xml'
       build_timeout: 240
       test_suite: mir_performance_tests mir_integration_tests mir_acceptance_tests mir_demo_client_basic mir_demo_client_fingerpaint mir_demo_client_eglflash mir_demo_client_eglplasma mir_demo_client_multiwin mir_demo_client_egltriangle mir_privileged_tests
-      standard_jobs: mir-clang-vivid-amd64-build mir-android-vivid-i386-build mir-mediumtests-vivid-touch
-      ci:
-        nonfatal_jobs: mir-mediumtests-xenial-touch
+      standard_jobs: mir-clang-vivid-amd64-build mir-android-vivid-i386-build mir-mediumtests-vivid-touch mir-mediumtests-xenial-touch
       configurations:
         xenial-armhf: False # the armhf build is part of mir-mediumtests-vivid-touch