Merge lp://staging/~abentley/juju-release-tools/azure-arm-streams-latest into lp://staging/juju-release-tools
| Status: | Merged |
|---|---|
| Merged at revision: | 360 |
| Proposed branch: | lp://staging/~abentley/juju-release-tools/azure-arm-streams-latest |
| Merge into: | lp://staging/juju-release-tools |
| Prerequisite: | lp://staging/~abentley/juju-release-tools/azure-streams-tweaks |
| Diff against target: |
360 lines (+166/-22) 4 files modified
azure_image_streams.py (+72/-16) make_image_streams.py (+6/-1) tests/test_azure_image_streams.py (+86/-4) tests/test_make_image_streams.py (+2/-1) |
| To merge this branch: | bzr merge lp://staging/~abentley/juju-release-tools/azure-arm-streams-latest |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Curtis Hovey (community) | code | Approve | |
|
Review via email:
|
|||
Commit message
Get ubuntu images by sku
Description of the change
This branch changes the azurm-arm streams to use sku to look up ubuntu images, rather than attempting to convert cloudware images.
It also causes them to use 'latest' rather than a specific version, which matches the current Juju behaviour. Supplying Ubuntu images this way is intended as a stopgap until Cloudware can publish Azure streams.
It also forces the id to be provided at the lowest level, even in cases where this is redundant. This works around a Juju bug.
Importing simplestreams has the side effect of configuring logging (in a not-helpful way, i.e. disabling all output). This branch works around this by running logging.basicConfig before simplestreams is imported.
It also adds some windows image types and expected-missing cloudware images.
Thank you.