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

[Simon Fels]

citrain: Do not require a writable image for silo upgrades and don't restart service while upgrading their packages as this is done on the reboot we perform anyway.

This fixes some important things:

 * don't force a writable-image but use a mount -o remount instead to come closer to a production environment when testing silos where rootfs is not writable.
 * don't restart any services when upgrading packages. This will just not work for some packages and we do a full device reboot anyway once we're done installing a silo

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:342
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~morphis/phablet-tools/citrain-changes/+merge/271094/+edit-commit-message

http://jenkins.qa.ubuntu.com/job/phablet-tools-ci/445/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-amd64-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-armhf-ci/22
    SUCCESS: http://jenkins.qa.ubuntu.com/job/phablet-tools-vivid-i386-ci/22

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

review: Needs Fixing (continuous-integration)

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

343. By Simon Fels on 2015-09-15

Don't add --force-yes

[Oliver Grawert (ogra)]

looks good

review: Approve

=== modified file 'citrain'
--- citrain	2015-05-07 15:24:45 +0000
+++ citrain	2015-09-15 12:02:18 +0000
@@ -92,12 +92,17 @@
                 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 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 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.pref"
         adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A apt-get -o Dir::Etc::SourceList=/dev/null update
         adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A apt-get dist-upgrade --yes
+        adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A mv /tmp/policy-rc.d /usr/sbin/policy-rc.d
         adb shell rm -f /tmp/askpass.sh
         adb reboot
         ;;