Merge lp:~morphis/phablet-tools/combined-citrain-changes into lp:phablet-tools

[Simon Fels]

Fixes and new features (multiple silo support) for citrain

Combined changes from:

https://code.launchpad.net/~davmor2/phablet-tools/add-autoremove
https://code.launchpad.net/~morphis/phablet-tools/multiple-silos
https://code.launchpad.net/~morphis/phablet-tools/citrain-changes

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:344
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/450/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-amd64-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-armhf-ci/27
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-i386-ci/27

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/450/rebuild

review: Approve (continuous-integration)

[lp:~morphis/phablet-tools/combined-citrain-changes]

345. By Simon Fels on 2015-09-25

Respect a not present /usr/sbin/policy-rc.d file

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:345
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/451/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-amd64-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-armhf-ci/28
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-i386-ci/28

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/451/rebuild

review: Approve (continuous-integration)

[lp:~morphis/phablet-tools/combined-citrain-changes]

346. By Simon Fels on 2015-09-25

Put lxc-android-config package on hold during upgrade as we can't really upgrade it

347. By Simon Fels on 2015-09-25

Prevent adb from getting locked when the display turns on during us operating with it

348. By Simon Fels on 2015-09-25

Delete askpass.sh as last thing we're doing

349. By Simon Fels on 2015-09-25

Defer reboot a bit to have some time to clean up things

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:349
http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/452/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-amd64-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-armhf-ci/29
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-i386-ci/29

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/phablet-tools-ci/452/rebuild

review: Approve (continuous-integration)

[Robert Bruce Park (robru)]

*looks* good to me but admittedly I never tested it. did you get a QA person to verify this works?

review: Approve

=== modified file 'citrain'
--- citrain	2015-05-07 15:24:45 +0000
+++ citrain	2015-09-25 15:35:32 +0000
@@ -92,14 +92,33 @@
                 DISTRO="ubuntu"
             fi
         fi
-        phablet-config writable-image -r $PASSWORD --ppa $PPA/$DISTRO/$SILO
         adb shell "echo -e '#\x21/bin/sh\necho $PASSWORD' >/tmp/askpass.sh"
         adb shell chmod +x /tmp/askpass.sh
-        adb shell "echo -e 'Package: *\nPin: release o=LP-PPA-ci-train-ppa-service-$SILO\nPin-Priority: 1100' | SUDO_ASKPASS=/tmp/askpass.sh sudo -A tee /etc/apt/preferences.d/silo.pref"
+        adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A touch /userdata/.adb_onlock
+        adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A mount -o remount,rw /
+        adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A add-apt-repository -y $PPA/$DISTRO/$SILO
+
+        adb shell "test -e /usr/sbin/policy-rc.d && cp /usr/sbin/policy-rc.d /tmp/policy-rc.d"
+        adb shell "echo 'exit 101' | SUDO_ASKPASS=/tmp/askpass.sh sudo -A tee /usr/sbin/policy-rc.d"
+        adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A chmod +x /usr/sbin/policy-rc.d
+        adb shell "echo -e 'Package: *\nPin: release o=LP-PPA-ci-train-ppa-service-$SILO\nPin-Priority: 1100' | SUDO_ASKPASS=/tmp/askpass.sh sudo -A tee /etc/apt/preferences.d/silo-$SILO.pref"
         adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A apt-get -o Dir::Etc::SourceList=/dev/null update
+
+        # We need to put lxc-android-config on hold here as it's the only
+        # package which must be upgrade by hand through the recovery. See
+        # https://wiki.ubuntu.com/Touch/Testing/lxc-android-config for details.
+        adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A apt-mark hold lxc-android-config
+
         adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A apt-get dist-upgrade --yes
-        adb shell rm -f /tmp/askpass.sh
-        adb reboot
+        adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A apt-get update
+        adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A apt-get autoremove --yes
+
+        adb shell "test ! -e /tmp/policy-rc.d && SUDO_ASKPASS=/tmp/askpass.sh sudo -A rm /usr/sbin/policy-rc.d"
+        adb shell "test -e /tmp/policy-rc.d && SUDO_ASKPASS=/tmp/askpass.sh sudo -A mv /tmp/policy-rc.d /usr/sbin/policy-rc.d"
+        adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A apt-mark unhold lxc-android-config
+        adb shell "echo 'sleep 1 ; reboot' > /tmp/reboot.sh"
+        adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A /bin/sh /tmp/reboot.sh &
+        adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A rm /userdata/.adb_onlock && rm -f /tmp/askpass.sh
         ;;
 
     host-purge)