Landscape Charm

Merge lp://qastaging/~free.ekanayaka/landscape-charm/pull-python-2-in-install-hook into lp://qastaging/~landscape/landscape-charm/trunk

  1. pull-python-2-in-install-hook
  2. Merge into trunk
Proposed by Free Ekanayaka
Status: Merged
Approved by: Free Ekanayaka
Approved revision: 352
Merged at revision: 349
Proposed branch: lp://qastaging/~free.ekanayaka/landscape-charm/pull-python-2-in-install-hook
Merge into: lp://qastaging/~landscape/landscape-charm/trunk
Diff against target: 780 lines (+227/-125)
13 files modified
Makefile (+2/-0)
charmhelpers/core/hookenv.py (+31/-0)
charmhelpers/core/host.py (+132/-56)
charmhelpers/fetch/__init__.py (+9/-1)
charmhelpers/fetch/bzrurl.py (+15/-29)
charmhelpers/fetch/giturl.py (+20/-19)
dev/ubuntu-deps (+3/-8)
hooks/install (+1/-1)
lib/apt.py (+4/-3)
lib/tests/rootdir.py (+1/-1)
lib/tests/test_apt.py (+4/-3)
lib/tests/test_install.py (+3/-3)
lib/tests/test_upgrade.py (+2/-1)
To merge this branch: bzr merge lp://qastaging/~free.ekanayaka/landscape-charm/pull-python-2-in-install-hook
Reviewer Review Type Date Requested Status
Данило Шеган (community) Abstain
Benji York (community) Approve
Chris Glass (community) Approve
🤖 Landscape Builder test results Approve
Review via email: mp+294010@code.qastaging.launchpad.net

Commit message

This branch modifies the landscape-server charm minimally to get it
working on xenial units.

The change ports the install hook (and related tests) to python 3, so
we can install python 2 along with our regular dependencies.

Description of the change

This branch modifies the landscape-server charm minimally to get it
working on xenial units.

The change ports the install hook (and related tests) to python 3, so
we can install python 2 along with our regular dependencies.

I've tested this modified charm both with trusty and xenial targets
and it worked okay [0].

The diff is a bit large mainly because it contains a charmhelper upgrade,
the bare diff is here:

https://pastebin.canonical.com/155935/

[0] we have no bundle for xenial yet but you can test it by using
    something like this https://pastebin.canonical.com/155933/
    (replace placeholder values as appropriate)

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: Fail
Revno: 349
Branch: lp:~free.ekanayaka/landscape-charm/pull-python-2-in-install-hook
Jenkins: https://ci.lscape.net/job/latch-test/4531/

review: Needs Fixing (test results)
lp://qastaging/~free.ekanayaka/landscape-charm/pull-python-2-in-install-hook updated
350. By Free Ekanayaka

Fix tests

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: Fail
Revno: 350
Branch: lp:~free.ekanayaka/landscape-charm/pull-python-2-in-install-hook
Jenkins: https://ci.lscape.net/job/latch-test/4532/

review: Needs Fixing (test results)
lp://qastaging/~free.ekanayaka/landscape-charm/pull-python-2-in-install-hook updated
351. By Free Ekanayaka

Fix import

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: Fail
Revno: 351
Branch: lp:~free.ekanayaka/landscape-charm/pull-python-2-in-install-hook
Jenkins: https://ci.lscape.net/job/latch-test/4533/

review: Needs Fixing (test results)
lp://qastaging/~free.ekanayaka/landscape-charm/pull-python-2-in-install-hook updated
352. By Free Ekanayaka

Fix import for real

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: 352
Branch: lp:~free.ekanayaka/landscape-charm/pull-python-2-in-install-hook
Jenkins: https://ci.lscape.net/job/latch-test/4534/

review: Approve (test results)
Revision history for this message
Chris Glass (tribaal) wrote :

Looks good, +1.

review: Approve
Revision history for this message
Benji York (benji) wrote :

This branch looks good. I commented on a few small things inline.

review: Approve
Revision history for this message
Данило Шеган (danilo) wrote :

make lint complains:

$ make lint
flake8 --filename='*' hooks
flake8 lib tests
lib/action.py:36:27: E901 SyntaxError: invalid syntax
Makefile:64: recipe for target 'lint' failed
make: *** [lint] Error 1

I'll do a run with xenial just in case (since I've already started looking at this)

Revision history for this message
Данило Шеган (danilo) wrote :

I am having trouble with my local env and xenial, so I won't be doing a test run right now: please don't block on me (you've already got enough reviews).

review: Abstain
Revision history for this message
Free Ekanayaka (free.ekanayaka) wrote :

> make lint complains:
>
> $ make lint
> flake8 --filename='*' hooks
> flake8 lib tests
> lib/action.py:36:27: E901 SyntaxError: invalid syntax
> Makefile:64: recipe for target 'lint' failed
> make: *** [lint] Error 1

Fixed.

Revision history for this message
Free Ekanayaka (free.ekanayaka) :

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches