Merge lp:~morphis/phablet-tools/multiple-silos into lp:phablet-tools

[Simon Fels]

Add support to install multiple silos with the citrain utility.

Add support to install multiple silos with the citrain utility.

[Timo Jyrinki (timo-jyrinki)]

Ready for landing.

[Timo Jyrinki (timo-jyrinki)]

davmor2 has some suggestions still..

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

[Dave Morley (davmor2)]

Couple of small things.
1 remove the "-a" from "tee -a" it is not needed we are not appending anything and there is less chance of a mix up.
2 Add a - between silo and $SILO this makes the name more readable.

Other than that works a charm thanks.

[lp:~morphis/phablet-tools/multiple-silos]

344. By Simon Fels on 2015-09-25

Use just the silo number to extend the preference file name

[Robert Bruce Park (robru)]

Why are you using $1? I don't like the look of that because the script uses `shift` a lot, if a new argument gets added later $1 may not refer to the siloname anymore. It should probably stay as $SILO for future-proofing reasons.

[lp:~morphis/phablet-tools/multiple-silos]

345. By Simon Fels on 2015-09-25

Switch back to full silo name in file name

[PS Jenkins bot (ps-jenkins)]

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

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

review: Approve (continuous-integration)

=== modified file 'citrain'
--- citrain	2015-05-07 15:24:45 +0000
+++ citrain	2015-09-25 06:54:47 +0000
@@ -95,7 +95,7 @@
         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 "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
         adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A apt-get dist-upgrade --yes
         adb shell rm -f /tmp/askpass.sh