Merge lp://staging/~abentley/juju-release-tools/azure-streams-tweaks into lp://staging/juju-release-tools

Proposed by Aaron Bentley
Status: Merged
Merged at revision: 360
Proposed branch: lp://staging/~abentley/juju-release-tools/azure-streams-tweaks
Merge into: lp://staging/juju-release-tools
Diff against target: 89 lines (+10/-7)
4 files modified
Makefile (+2/-1)
azure_image_streams.py (+4/-4)
tests/test_azure_image_streams.py (+3/-1)
tests/test_make_release_notes.py (+1/-1)
To merge this branch: bzr merge lp://staging/~abentley/juju-release-tools/azure-streams-tweaks
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code Approve
Review via email: mp+307081@code.staging.launchpad.net

Commit message

Update Azure image streams per axwalk's request.

Description of the change

This branch makes the changes Andrew Wilkins requested to Azure image streams.

It uses "com.ubuntu.cloud:server" for all images, even though Windows 10 is not a server OS.

It adds a "version" field, with the same contents as "release", to CentOS and Windows images.

It also makes some changes not requested by Andrew.

It adds UK South and UK West to the list of region item names, because these now appear in cloud-images data.

It fixes a failing test and "make lint".

To post a comment you must log in.
331. By Aaron Bentley

Merged trunk into azure-streams-tweaks.

332. By Aaron Bentley

Fix lint.

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

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