Phablet Tools

Merge lp:~robru/phablet-tools/fix-overlay-pinning into lp:phablet-tools

  1. fix-overlay-pinning
  2. Merge into trunk
Proposed by Robert Bruce Park
Status: Merged
Approved by: Robert Bruce Park
Approved revision: 338
Merged at revision: 338
Proposed branch: lp:~robru/phablet-tools/fix-overlay-pinning
Merge into: lp:phablet-tools
Diff against target: 11 lines (+1/-0)
1 file modified
citrain (+1/-0)
To merge this branch: bzr merge lp:~robru/phablet-tools/fix-overlay-pinning
Reviewer Review Type Date Requested Status
Allan LeSage (community) Approve
PS Jenkins bot continuous-integration Approve
Steve Langasek Approve
Łukasz Zemczak by-stander Approve
Robert Bruce Park (community) Approve
Timo Jyrinki Pending
Review via email: mp+258514@code.launchpad.net

Commit message

Fix silo pinning issue.

To post a comment you must log in.
Revision history for this message
Robert Bruce Park (robru) wrote :

This worked for me on my krillin with image 204

review: Approve
Revision history for this message
Łukasz Zemczak (sil2100) wrote :

Looks ok to me. My only personal complaint would be the 1100 pin priority - we know it needs to be higher than 1001 but this seems a bit too big in case someone has their own pin priorities set. But that's just bikesheding.

Still, I would prefer some of the real users/maintainers to review and comment.

review: Approve (by-stander)
Revision history for this message
Steve Langasek (vorlon) wrote :

I don't think you need to worry about leaving a gap in the priorities - we aren't going to have multiple layers here. So a priority of 1002 would be sufficient. But I don't mind the use of 1100 either.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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

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

review: Approve (continuous-integration)
Revision history for this message
Allan LeSage (allanlesage) wrote :

So this did have the effect of selecting the silo version from last night's use case, approving.

phablet@ubuntu-phablet:~$ apt-cache policy qtubuntu-media
qtubuntu-media:
  Installed: 0.7.1+15.04.20150428.1-0ubuntu1
  Candidate: 0.7.1+15.04.20150428.1-0ubuntu1
  Version table:
 *** 0.7.1+15.04.20150428.1-0ubuntu1 0
       1100 http://ppa.launchpad.net/ci-train-ppa-service/landing-025/ubuntu/ vivid/main armhf Packages
        100 /var/lib/dpkg/status
     0.7.1+15.04.20150427.2-0ubuntu1 0
       1001 http://ppa.launchpad.net/ci-train-ppa-service/stable-phone-overlay/ubuntu/ vivid/main armhf Packages

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'citrain'
2--- citrain 2015-03-26 00:04:01 +0000
3+++ citrain 2015-05-07 15:25:09 +0000
4@@ -95,6 +95,7 @@
5 phablet-config writable-image -r $PASSWORD --ppa $PPA/$DISTRO/$SILO
6 adb shell "echo -e '#\x21/bin/sh\necho $PASSWORD' >/tmp/askpass.sh"
7 adb shell chmod +x /tmp/askpass.sh
8+ 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"
9 adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A apt-get -o Dir::Etc::SourceList=/dev/null update
10 adb shell SUDO_ASKPASS=/tmp/askpass.sh sudo -A apt-get dist-upgrade --yes
11 adb shell rm -f /tmp/askpass.sh

Subscribers

People subscribed via source and target branches