Fake Juju

Merge lp:~fginther/fake-juju/remove-txjuju-ppa into lp:~landscape/fake-juju/trunk-old

  1. remove-txjuju-ppa
  2. Merge into trunk-old
Proposed by Francis Ginther
Status: Merged
Approved by: Francis Ginther
Approved revision: 55
Merged at revision: 55
Proposed branch: lp:~fginther/fake-juju/remove-txjuju-ppa
Merge into: lp:~landscape/fake-juju/trunk-old
Diff against target: 34 lines (+6/-6)
2 files modified
Makefile (+0/-1)
README (+6/-5)
To merge this branch: bzr merge lp:~fginther/fake-juju/remove-txjuju-ppa
Reviewer Review Type Date Requested Status
Eric Snow (community) Approve
🤖 Landscape Builder test results Approve
Landscape Pending
Review via email: mp+311269@code.launchpad.net

Commit message

Remove automatic addition of ppa:landscape/txjuju-daily and move it to the README.

Description of the change

Remove automatic addition of ppa:landscape/txjuju-daily and move it to the README.

Testing instructions:
 1) Start with a clean environment
 2) Run ci-test, watch it fail to locate python-txjuju
 3) Execute the PPA instructions from the README
 4) Run ci-test again, it will install all dependencies this time

Once this is merged, the jenkins slaves will need to be cleaned.

To post a comment you must log in.
Revision history for this message
🤖 Landscape Builder (landscape-builder) :
review: Abstain (executing tests)
Revision history for this message
🤖 Landscape Builder (landscape-builder) wrote :

Command: make ci-test
Result: Success
Revno: 55
Branch: lp:~fginther/fake-juju/remove-txjuju-ppa
Jenkins: https://ci.lscape.net/job/latch-test-xenial/973/

review: Approve (test results)
Revision history for this message
Eric Snow (ericsnowcurrently) wrote :

LGTM

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'Makefile'
2--- Makefile 2016-11-03 16:56:10 +0000
3+++ Makefile 2016-11-18 13:13:12 +0000
4@@ -182,7 +182,6 @@
5
6 .PHONY: ci-test
7 ci-test:
8- sudo add-apt-repository -y --update ppa:landscape/txjuju-daily
9 sudo apt-get -y install --force-yes \
10 wget \
11 python3-pip \
12
13=== modified file 'README'
14--- README 2016-05-17 18:29:45 +0000
15+++ README 2016-11-18 13:13:12 +0000
16@@ -14,12 +14,13 @@
17 Dependencies
18 ------------
19
20-To run tests, the code will need a recent python-jujuclient package installed.
21-One should add the juju-stable PPA to get a fresh enough version on at least
22-trusty and vivid:
23+To run tests, the code will need the latest python-jujuclient and python-txjuju
24+packages installed. These builds are available from the juju-stable and
25+txjuju-daily PPAs and can be added with:
26
27-sudo add-apt-repository ppa:juju/stable
28-sudo apt-get update && sudo apt-get install python-jujuclient
29+sudo add-apt-repository -y ppa:juju/stable
30+sudo add-apt-repository -y ppa:landscape/txjuju-daily
31+sudo apt-get update && sudo apt-get install python-jujuclient python-txjuju
32
33 Building
34 ---------

Subscribers

People subscribed via source and target branches