Merge lp:~mterry/ubuntu-system-settings/kill-maliit into lp:ubuntu-system-settings

[Michael Terry]

Kill maliit-server when wizard is done. This is because maliit-server is normally tied to the Mir server that launched it. Unless we kill it, it won't be re-associated with unity8 correctly.

Kill maliit-server when wizard is done. This is because maliit-server is normally tied to the Mir server that launched it. Unless we kill it, it won't be re-associated with unity8 correctly.

This used to be done, but got dropped somehow.

== Checklist ==

 * Is your branch in sync with latest trunk (e.g. bzr pull lp:trunk -> no changes)
 - Yes

 * Did you build your software in a clean sbuild/pbuilder chroot or ppa?
 - Yes

 * Did you build your software in a clean sbuild/pbuilder armhf chroot or ppa?
 - Yes

 * Has your component "TestPlan” been executed successfully on emulator, N4?
 - NA

 * Has a 5 minute exploratory testing run been executed on N4?
 - Yes

 * If you changed the packaging (debian), did you subscribe a core-dev to this MP?
 - NA

 * If you changed the UI, did you subscribe the design-reviewers to this MP?
 - NA

 * What components might get impacted by your changes?
 - wizard, maliit, unity8

 * Have you requested review by the teams of these owning components?
 - No, this is simple to test

[lp:~mterry/ubuntu-system-settings/kill-maliit]

759. By Michael Terry on 2014-07-02

Don't care if command fails

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:758
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/921/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1496
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1290
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/113
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/113/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/113
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1780
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2467
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2467/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9198
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1063
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1438
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1438/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/921/rebuild

review: Approve (continuous-integration)

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:759
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/922/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/1500
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-utopic/1296
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-amd64-ci/114
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/114
        deb: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-armhf-ci/114/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-utopic-i386-ci/114
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/1783
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2471
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/2471/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/9203
    SUCCESS: http://jenkins.qa.ubuntu.com/job/autopilot-testrunner-otto-utopic/1070
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1444
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-amd64/1444/artifact/work/output/*zip*/output.zip

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/ubuntu-system-settings-ci/922/rebuild

review: Needs Fixing (continuous-integration)

[Iain Lane (laney)]

Seems fine, as it goes.

Out of interest, why can't this be done in maliit's job? Just from looking, it feels as if adding 'or starting' and 'or stopping' cases for the wizard would work to start and stop maliit when you want to.

review: Approve

[Michael Terry (mterry)]

> Out of interest, why can't this be done in maliit's job?
> Just from looking, it feels as if adding 'or starting'
> and 'or stopping' cases for the wizard would work to
> start and stop maliit when you want to.

There's a technical reason -- some things we want to do before unity8 starts to avoid race condition. But the wizard starts on "starting unity8" so as soon as the wizard's *target* is set to "stopped," upstart will continue with unity8. So the only way to guarantee we get to do something before unity8 starts is to do it in the cleanup job, before our target is set to "stopped."

But also, I figured that the wizard was a special case situation, not part of the "normal operation." So I didn't want to clutter up maliit's job and preferred that the wizard be self-contained.

=== modified file 'wizard/ubuntu-system-settings-wizard-cleanup.conf'
--- wizard/ubuntu-system-settings-wizard-cleanup.conf	2014-06-15 19:12:41 +0000
+++ wizard/ubuntu-system-settings-wizard-cleanup.conf	2014-07-02 20:04:52 +0000
@@ -35,6 +35,9 @@
 
     # Stop any indicators so they will be restarted with new environment
     initctl emit indicator-services-end
+
+    # Stop maliit-server, since it needs to be restarted by unity8
+    stop maliit-server || true
 end script
 
 post-stop script