juju-release-tools

Merge lp://staging/~abentley/juju-release-tools/republish-old-azure into lp://staging/juju-release-tools

  1. republish-old-azure
  2. Merge into trunk
Proposed by Aaron Bentley
Status: Merged
Merged at revision: 325
Proposed branch: lp://staging/~abentley/juju-release-tools/republish-old-azure
Merge into: lp://staging/juju-release-tools
Diff against target: 480 lines (+379/-12)
2 files modified
azure_image_streams.py (+168/-4)
tests/test_azure_image_streams.py (+211/-8)
To merge this branch: bzr merge lp://staging/~abentley/juju-release-tools/republish-old-azure
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code Approve
Review via email: mp+300924@code.staging.launchpad.net

Commit message

Convert cloud-images to azure-arm.

Description of the change

This branch adds Ubuntu to the ARM image streams.

It does this by parsing the id and determining the equivalent spec and URN. This spec is then verified against Azure to ensure that it exists.

Minimal conversion is done. The item id is replaced with a URN, the endpoint is replaced with the ARM endpoint, and the csrn (an alias not used by this output) is dropped.

The id parsing is complicated but documented in the code. Should the version/sku be incorrectly determined in the future, the command will error.

The items_from_url code is untested, but based on sstream-query from simplestreams. (Because it's in a script, it can't be imported.)

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

Thank you.

As this is mapping to ARM, does this mean Juju 1.x will never support windows? I believe 1.25 is reading from scc.com. Do you know if 1.25 will switch to cloud-images if it cannot find a match?

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

This is about adding Ubuntu images. The changes for Windows have already landed.

1.25 does not currently support https://streams.canonical.com/juju/images because it of bug #1583789. I don't know whether 1.25 can look for Windows images in simplestreams. If it could, it would be a separate development effort to enable Windows on 1.25.

1.25 on AWS falls back if it doesn't find a match. I assume the same is true for Azure, but it's not relevant since 1.25 won't use streams.canonical.com/juju/images in the first place.

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

Example output is here:
https://s3.amazonaws.com/abentley-streams/azure-image-streams/streams/v1/com.ubuntu.cloud-released-azure.json

Revision history for this message
Curtis Hovey (sinzui) wrote :

Thank you.

I think there is a small risk that 1.25 could be enabled and not behave as we expect. We will see that in testing SO I think all is good.

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

We shouldn't publish Azure streams to s.c.c. until 2.0 supports Azure anyway. But we need to have the streams as a reference to test 2.0 against.

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