Merge lp://staging/~abentley/juju-release-tools/image-compatibility into lp://staging/juju-release-tools

Proposed by Aaron Bentley
Status: Merged
Merged at revision: 301
Proposed branch: lp://staging/~abentley/juju-release-tools/image-compatibility
Merge into: lp://staging/juju-release-tools
Diff against target: 193 lines (+79/-14)
3 files modified
build-juju (+30/-0)
make_aws_image_streams.py (+33/-4)
tests/test_make_aws_image_streams.py (+16/-10)
To merge this branch: bzr merge lp://staging/~abentley/juju-release-tools/image-compatibility
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code Approve
Review via email: mp+294290@code.staging.launchpad.net

Commit message

Write image streams in a way compatible with old jujus.

Description of the change

Improve the compatibility of our image streams with old jujus.

Old jujus expected to find root_store and virt at the item level, but we were storing it at a higher level. The simplestreams authoring tools support forcing an attribute to be stored at the item level with the 'sticky' parameter.

Unfortunately, the 'sticky' parameter was not exposed by write_juju_streams, so I had to copy its implementation in order to set 'sticky'.

Let me know if you want more unit tests for write_juju_streams.

To post a comment you must log in.
Revision history for this message
Curtis Hovey (sinzui) wrote :

Thank you.

review: Approve (code)
Revision history for this message
Aaron Bentley (abentley) wrote :

On 2016-05-10 03:38 PM, Curtis Hovey wrote:
> Is your tree stale? I reviewed this some time ago and it is in the tree.

I forgot to push after I merged it locally. I'm not sure why it was in
your tree.

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