Merge lp:~ken-vandine/ubuntu-system-settings/lp1489389 into lp:ubuntu-system-settings

[Ken VanDine]

[system-updates] If the system hasn't rebooted within 30 seconds of requesting to install a system update, retry.

If the system hasn't rebooted within 30 seconds of requesting to install a system update, retry.

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1513
http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-ci/2364/
Executed test runs:
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-vivid-touch/3881
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-amd64-ci/139
    SUCCESS: http://jenkins.qa.ubuntu.com/job/ubuntu-system-settings-vivid-i386-ci/548
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-vivid-mako/3185
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3878
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-vivid-armhf/3878/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/22861

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

review: Needs Fixing (continuous-integration)

[Jonas G. Drange (jonas-drange)]

There's a “Rebooting” event from the SystemImage Service dbus object. I'm not sure what would prevent a reboot, but if it's because /sbin/reboot -f fails, we could check if the event has been fired and try again (after n seconds) if not? 30 secs seems random.

review: Needs Information

[Jonas G. Drange (jonas-drange)]

Does this MP take into account bug 1260768 (if applicable)?

review: Needs Information

[Sebastien Bacher (seb128)]

Ken, could you reply to the comments there?

[Ken VanDine (ken-vandine)]

> There's a “Rebooting” event from the SystemImage Service dbus object. I'm not
> sure what would prevent a reboot, but if it's because /sbin/reboot -f fails,
> we could check if the event has been fired and try again (after n seconds) if
> not? 30 secs seems random.

onRebooting is emitted when Rebooting is emitted from SystemImage dbus service. I'm not sure what conditions would cause system-image-dbus from rebooting the device, but I have seen a simple reattempt work. We are getting the signal reliably, because the "Restarting" label is being displayed. When it fails to reboot, you are just stuck on the "Restarting" view.

30 seconds is rather arbitrary. Some devices (arale and krilling) reboot instantly, but I have seen mako take much longer, perhaps even 10 seconds. I'd be happy to shorten the timer if you like.

[Ken VanDine (ken-vandine)]

> Does this MP take into account bug 1260768 (if applicable)?

not applicable

[system-apps-ci-bot (system-apps-ci-bot)]

FAILED: Continuous integration, rev:1513
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/10/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/system-apps/job/build/597/console
    FAILURE: https://jenkins.canonical.com/system-apps/job/build-0-fetch/597/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/system-apps/job/lp-ubuntu-system-settings-ci/10/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

1513. By Ken VanDine on 2015-08-27

[system-updates] If the system hasn't rebooted within 30 seconds of requesting
to install a system update, retry.

1512. By Ken VanDine on 2015-08-27

merged donot-query-on-error

=== modified file 'plugins/system-update/PageComponent.qml'
--- plugins/system-update/PageComponent.qml	2015-08-27 10:44:29 +0000
+++ plugins/system-update/PageComponent.qml	2015-08-27 10:44:30 +0000
@@ -234,6 +234,7 @@
 
         onRebooting: {
             installingImageUpdate.message = i18n.tr("Restarting…");
+            rebootTimer.start();
         }
     }
     Flickable {
@@ -708,6 +709,15 @@
         color: "#221e1c"
         property string message: i18n.tr("Installing update…")
 
+        Timer {
+            id: rebootTimer
+            onTriggered: UpdateManager.applySystemUpdate();
+            triggeredOnStart: false
+            repeat: false
+            running: false
+            interval: 30000
+        }
+
         Column {
             anchors.centerIn: parent
             spacing: units.gu(2)