Juju Charms Collection
adt-cloud-worker package

Merge lp:~cprov/charms/trusty/adt-cloud-worker/autopkgtest-from-ppa into lp:~canonical-ci-engineering/charms/trusty/adt-cloud-worker/trunk

  1. Trusty Tahr (14.04)
  2. autopkgtest-from-ppa
  3. Merge into trunk
Proposed by Celso Providelo
Status: Merged
Approved by: Celso Providelo
Approved revision: 6
Merged at revision: 6
Proposed branch: lp:~cprov/charms/trusty/adt-cloud-worker/autopkgtest-from-ppa
Merge into: lp:~canonical-ci-engineering/charms/trusty/adt-cloud-worker/trunk
Diff against target: 20 lines (+3/-1)
1 file modified
hooks/actions.py (+3/-1)
To merge this branch: bzr merge lp:~cprov/charms/trusty/adt-cloud-worker/autopkgtest-from-ppa
Reviewer Review Type Date Requested Status
Francis Ginther Approve
Review via email: mp+251863@code.launchpad.net

Commit message

Installing autopkgtest from our team ppa (3.9.6-0~1054~ubuntu14.04.1).

Description of the change

Installing autopkgtest from our team ppa (3.9.6-0~1054~ubuntu14.04.1).

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

Approve, that's the current source we're using for autopkgtest.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/actions.py'
2--- hooks/actions.py 2015-03-05 01:09:53 +0000
3+++ hooks/actions.py 2015-03-05 03:40:07 +0000
4@@ -7,7 +7,8 @@
5 from charmhelpers.core import hookenv
6
7
8-REQUIRED_PACKAGES = ['bzr', 'python-virtualenv', 'python3-dev']
9+REQUIRED_PACKAGES = [
10+ 'bzr', 'autopkgtest', 'python-virtualenv', 'python3-dev']
11 SERVICE_DIR = '/srv/adt-cloud-worker'
12
13 config = hookenv.config()
14@@ -17,6 +18,7 @@
15
16 def install_packages(service_name):
17 hookenv.log('Installing dependencies...')
18+ fetch.add_source('ppa:canonical-ci-engineering/ci-airline-phase-0')
19 fetch.configure_sources(update=True)
20 fetch.apt_install(REQUIRED_PACKAGES, fatal=True)
21

Subscribers

People subscribed via source and target branches