Merge lp:~pwlars/charms/xenial/jenkins-remote-slave/add-yaml-dep into lp:~canonical-ci-engineering/charms/xenial/jenkins-remote-slave/trunk

Proposed by Paul Larson
Status: Merged
Approved by: Paul Larson
Approved revision: 27
Merged at revision: 27
Proposed branch: lp:~pwlars/charms/xenial/jenkins-remote-slave/add-yaml-dep
Merge into: lp:~canonical-ci-engineering/charms/xenial/jenkins-remote-slave/trunk
Diff against target: 12 lines (+1/-1)
1 file modified
hooks/install.d/3000-ci-tools.sh (+1/-1)
To merge this branch: bzr merge lp:~pwlars/charms/xenial/jenkins-remote-slave/add-yaml-dep
Reviewer Review Type Date Requested Status
Paul Larson Approve
Review via email: mp+299693@code.launchpad.net

Description of the change

handles missing dep that can exist on a new deployment

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

self-approving

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 2016-06-01 18:05:19 +0000
3+++ hooks/install.d/3000-ci-tools.sh 2016-07-11 13:22:25 +0000
4@@ -12,7 +12,7 @@
5
6 apt-get update || apt-get update || apt-get update
7 apt-get install -y --assume-yes phablet-tools ubuntu-device-flash \
8- autopkgtest bzr-builder subunit ntp
9+ autopkgtest bzr-builder subunit ntp python3-yaml
10
11 #Update the udev rules needed for adb devices
12 install files/99-adb.rules /etc/udev/rules.d

Subscribers

People subscribed via source and target branches