Merge lp:~pwlars/charms/trusty/jenkins-remote-slave/udf-adb-ppa-updates into lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk

Proposed by Paul Larson
Status: Merged
Approved by: Paul Larson
Approved revision: 24
Merged at revision: 24
Proposed branch: lp:~pwlars/charms/trusty/jenkins-remote-slave/udf-adb-ppa-updates
Merge into: lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk
Diff against target: 15 lines (+5/-0)
1 file modified
hooks/install.d/3000-ci-tools.sh (+5/-0)
To merge this branch: bzr merge lp:~pwlars/charms/trusty/jenkins-remote-slave/udf-adb-ppa-updates
Reviewer Review Type Date Requested Status
Po-Hsu Lin (community) Approve
Canonical CI Engineering Pending
Review via email: mp+290944@code.launchpad.net

Description of the change

Updating the charm to match what has been deployed in production. These ppas are needed for installing the latest ubuntu-device-flash and android-tools to work with the latest images

To post a comment you must log in.
Revision history for this message
Po-Hsu Lin (cypressyew) wrote :

LGTM, with one small question though.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'hooks/install.d/3000-ci-tools.sh'
--- hooks/install.d/3000-ci-tools.sh 2016-03-23 03:39:48 +0000
+++ hooks/install.d/3000-ci-tools.sh 2016-04-05 03:27:11 +0000
@@ -6,6 +6,11 @@
6add-apt-repository ppa:utah/stable < /dev/null6add-apt-repository ppa:utah/stable < /dev/null
7add-apt-repository ppa:pwlars/jenkins < /dev/null7add-apt-repository ppa:pwlars/jenkins < /dev/null
88
9#For latest ubuntu-device-flash backport to trusty
10add-apt-repository ppa:ubuntu-sdk-team/ppa < /dev/null
11#For deps needed for udf that are in xenial, but not in trusty
12add-apt-repository ppa:snappy-dev/tools < /dev/null
13
9apt-get update || apt-get update || apt-get update14apt-get update || apt-get update || apt-get update
10apt-get install -y --assume-yes phablet-tools ubuntu-device-flash utah \15apt-get install -y --assume-yes phablet-tools ubuntu-device-flash utah \
11 autopkgtest bzr-builder subunit ntp16 autopkgtest bzr-builder subunit ntp

Subscribers

People subscribed via source and target branches