Juju Charms Collection
ubuntu-repository-cache package

Merge lp://staging/~axino/charms/trusty/ubuntu-repository-cache/xenial-ready into lp://staging/charms/trusty/ubuntu-repository-cache

  1. Trusty Tahr (14.04)
  2. xenial-ready
  3. Merge into trunk
Proposed by Junien Fridrick
Status: Merged
Merged at revision: 212
Proposed branch: lp://staging/~axino/charms/trusty/ubuntu-repository-cache/xenial-ready
Merge into: lp://staging/charms/trusty/ubuntu-repository-cache
Diff against target: 3038 lines (+1893/-292)
23 files modified
hooks/hooks.py (+4/-4)
lib/charmhelpers/contrib/charmsupport/nrpe.py (+52/-14)
lib/charmhelpers/contrib/storage/linux/ceph.py (+864/-61)
lib/charmhelpers/contrib/storage/linux/loopback.py (+10/-0)
lib/charmhelpers/contrib/storage/linux/utils.py (+8/-7)
lib/charmhelpers/core/hookenv.py (+220/-13)
lib/charmhelpers/core/host.py (+349/-79)
lib/charmhelpers/core/hugepage.py (+71/-0)
lib/charmhelpers/core/kernel.py (+68/-0)
lib/charmhelpers/core/services/helpers.py (+30/-5)
lib/charmhelpers/core/strutils.py (+30/-0)
lib/charmhelpers/core/templating.py (+21/-8)
lib/charmhelpers/core/unitdata.py (+61/-17)
lib/charmhelpers/fetch/__init__.py (+26/-2)
lib/charmhelpers/fetch/archiveurl.py (+1/-1)
lib/charmhelpers/fetch/bzrurl.py (+22/-32)
lib/charmhelpers/fetch/giturl.py (+20/-23)
lib/ubuntu_repository_cache/apache.py (+1/-1)
lib/ubuntu_repository_cache/mirror.py (+10/-7)
lib/ubuntu_repository_cache/service.py (+5/-5)
lib/ubuntu_repository_cache/squid.py (+17/-10)
lib/ubuntu_repository_cache/storage.py (+2/-2)
lib/ubuntu_repository_cache/util.py (+1/-1)
To merge this branch: bzr merge lp://staging/~axino/charms/trusty/ubuntu-repository-cache/xenial-ready
Reviewer Review Type Date Requested Status
Review Queue (community) automated testing Needs Fixing
Robert C Jennings (community) Approve
Stuart Bishop (community) Approve
Review via email: mp+298880@code.staging.launchpad.net

Description of the change

make the charm ready for xenial and python3

To post a comment you must log in.
Revision history for this message
Junien Fridrick (axino) wrote :

Note that ideally, this should go in lp:charms/xenial/ubuntu-repository-cache

Revision history for this message
Stuart Bishop (stub) wrote :

All good, apart from a minor nit mentioned in line that doesn't really matter.

Revision history for this message
Stuart Bishop (stub) wrote :

This branch supports both Xenial and Trusty. It should probably be declared as multiseries in metadata.yaml, and moved to a new series-independent home like https://launchpad.net/ubuntu-repository-cache or https://launchpad.net/ubuntu-repository-cache-charm.

The choice of where it ends up is with the maintainer (Robert Jennings is listed, but maybe this needs to be changed to a team since you are doing this fix), and they will need to publish their charm onto the charm store and request to the ecosystem team that it is promulgated to cs:ubuntu-repository-cache (ingestion has been replaced by maintainers publishing directly).

Revision history for this message
Stuart Bishop (stub) wrote :

Approve, pending test run.

review: Approve
Revision history for this message
Robert C Jennings (rcj) wrote :

@axino, thanks for doing this work to enable the charm for xenial.

@stub, we'll change the maintainer to ~cloudware and work on where this code needs to live.

review: Approve
Revision history for this message
Robert C Jennings (rcj) wrote :

stub, can this be merged soon so that we can move on to MP#299472 that will add the multiseries metadata to make use of this change? What are the next actions?

Revision history for this message
Stuart Bishop (stub) wrote :

I have merge this into lp:charms/trusty/ubuntu-repository-cache as requested.

Next steps are to push this to a new non-charmers home (launchpad.net/ubuntu-repository-cache?), make it multiseries, push and publish it to the charm store, and get the ecosystem team to promulgate it.

Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5012/

review: Needs Fixing (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-aws/5035/

review: Needs Fixing (automated testing)
Revision history for this message
Review Queue (review-queue) wrote :

This item has failed automated testing! Results available here http://juju-ci.vapour.ws/job/charm-bundle-test-lxc/4816/

review: Needs Fixing (automated testing)

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

to all changes: