Merge lp:~gz/juju-release-tools/add_ap-northeast-2 into lp:juju-release-tools

Proposed by Martin Packman
Status: Merged
Merged at revision: 257
Proposed branch: lp:~gz/juju-release-tools/add_ap-northeast-2
Merge into: lp:juju-release-tools
Diff against target: 36 lines (+6/-2)
2 files modified
generate_mirrors.py (+4/-0)
tests/test_generate_mirrors.py (+2/-2)
To merge this branch: bzr merge lp:~gz/juju-release-tools/add_ap-northeast-2
Reviewer Review Type Date Requested Status
Curtis Hovey (community) code Approve
Review via email: mp+285083@code.launchpad.net

Description of the change

Add new AWS Korea region to mirrors

This does seem to be the only bit of code we have that cares about specifics of aws regions.

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

Thank you.

review: Approve (code)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'generate_mirrors.py'
2--- generate_mirrors.py 2015-12-08 05:57:11 +0000
3+++ generate_mirrors.py 2016-02-04 16:13:22 +0000
4@@ -50,6 +50,10 @@
5 "region": "ap-northeast-1"
6 },
7 {
8+ "endpoint": "https://ec2.ap-northeast-2.amazonaws.com",
9+ "region": "ap-northeast-2"
10+ },
11+ {
12 "endpoint": "https://ec2.sa-east-1.amazonaws.com",
13 "region": "sa-east-1"
14 },
15
16=== modified file 'tests/test_generate_mirrors.py'
17--- tests/test_generate_mirrors.py 2015-12-08 05:57:11 +0000
18+++ tests/test_generate_mirrors.py 2016-02-04 16:13:22 +0000
19@@ -71,7 +71,7 @@
20 self.assertEqual(
21 'https://juju-dist.s3.amazonaws.com/tools',
22 purposeful_mirrors[0]['mirror'])
23- self.assertEqual(10, len(purposeful_mirrors[0]['clouds']))
24+ self.assertEqual(11, len(purposeful_mirrors[0]['clouds']))
25 self.assertEqual(
26 'https://jujutools.blob.core.windows.net/juju-tools/tools',
27 purposeful_mirrors[1]['mirror'])
28@@ -102,7 +102,7 @@
29 self.assertEqual(
30 'https://juju-dist.s3.amazonaws.com/devel/tools',
31 purposeful_mirror[0]['mirror'])
32- self.assertEqual(10, len(purposeful_mirror[0]['clouds']))
33+ self.assertEqual(11, len(purposeful_mirror[0]['clouds']))
34 self.assertEqual(
35 'https://jujutools.blob.core.windows.net'
36 '/juju-tools/devel/tools',

Subscribers

People subscribed via source and target branches