Juju Charms Collection
jenkins-remote-slave package

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

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

Description of the change

This ppa no longer exists, and I confirmed with QA that they no longer need those packages. This will just prevent deployment with this charm from failing in the future.

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

approve

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-09 14:48:39 +0000
3+++ hooks/install.d/3000-ci-tools.sh 2016-03-22 20:09:35 +0000
4@@ -4,11 +4,10 @@
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 nfss-insert python3-babeltrace
13+ autopkgtest bzr-builder subunit ntp
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