Juju Charms Collection
jenkins-remote-slave package

Merge lp:~pwlars/charms/trusty/jenkins-remote-slave/add-qa-deps into lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk

  1. Trusty Tahr (14.04)
  2. add-qa-deps
  3. Merge into trunk
Proposed by Paul Larson
Status: Merged
Approved by: Francis Ginther
Approved revision: 21
Merged at revision: 21
Proposed branch: lp:~pwlars/charms/trusty/jenkins-remote-slave/add-qa-deps
Merge into: lp:~canonical-ci-engineering/charms/trusty/jenkins-remote-slave/trunk
Diff against target: 16 lines (+2/-1)
1 file modified
hooks/install.d/3000-ci-tools.sh (+2/-1)
To merge this branch: bzr merge lp:~pwlars/charms/trusty/jenkins-remote-slave/add-qa-deps
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Review via email: mp+244151@code.launchpad.net

Description of the change

Some dependencies needed by QA

To post a comment you must log in.
Revision history for this message
Francis Ginther (fginther) wrote :

Approve, we should look into replacing "< /dev/null" with "add-apt-repository --yes".

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/install.d/3000-ci-tools.sh'
2--- hooks/install.d/3000-ci-tools.sh 2014-12-08 22:36:08 +0000
3+++ hooks/install.d/3000-ci-tools.sh 2014-12-09 14:50:04 +0000
4@@ -4,10 +4,11 @@
5 #Install tools needed for working with devices
6 add-apt-repository ppa:phablet-team/tools < /dev/null
7 add-apt-repository ppa:utah/stable < /dev/null
8+add-apt-repository ppa:canonical-ci-engineering/ci-airline-phase-0 < /dev/null
9
10 apt-get update || apt-get update || apt-get update
11 apt-get install -y --assume-yes phablet-tools ubuntu-device-flash utah \
12- autopkgtest bzr-builder subunit ntp
13+ autopkgtest bzr-builder subunit ntp nfss-insert python3-babeltrace
14
15 #Update the udev rules needed for adb devices
16 install files/99-adb.rules /etc/udev/rules.d

Subscribers

People subscribed via source and target branches