juju-release-tools

Merge lp:~sinzui/juju-release-tools/win10-agents into lp:juju-release-tools

  1. win10-agents
  2. Merge into trunk
Proposed by Curtis Hovey
Status: Merged
Merged at revision: 263
Proposed branch: lp:~sinzui/juju-release-tools/win10-agents
Merge into: lp:juju-release-tools
Diff against target: 53 lines (+7/-4)
3 files modified
agent_archive.py (+3/-0)
make_agent_json.py (+2/-2)
tests/test_agent_archive.py (+2/-2)
To merge this branch: bzr merge lp:~sinzui/juju-release-tools/win10-agents
Reviewer Review Type Date Requested Status
Aaron Bentley (community) Approve
Review via email: mp+286347@code.launchpad.net

Description of the change

Add win10, win2016, and win2016nano agents.

This branch adds win10, win2016, and win2016nano to the list of agents we make.
These additions match known version in
    https://github.com/juju/utils/blob/master/series/supportedseries.go

It is okay to create agents for versions that older jujus don't know. We just want to be certain there are agents for series we expect juju to provision.

To post a comment you must log in.
Revision history for this message
Aaron Bentley (abentley) wrote :

Thank you.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'agent_archive.py'
2--- agent_archive.py 2015-08-06 21:31:53 +0000
3+++ agent_archive.py 2016-02-17 15:50:52 +0000
4@@ -20,9 +20,12 @@
5 'juju-{}-win2012hv-amd64.tgz',
6 'juju-{}-win2012r2-amd64.tgz',
7 'juju-{}-win2012-amd64.tgz',
8+ 'juju-{}-win2016-amd64.tgz',
9+ 'juju-{}-win2016nano-amd64.tgz',
10 'juju-{}-win7-amd64.tgz',
11 'juju-{}-win8-amd64.tgz',
12 'juju-{}-win81-amd64.tgz',
13+ 'juju-{}-win10-amd64.tgz',
14 )
15 # The versions of agent that may or will exist. The agents will
16 # always start with juju, the series will start with "win" and the
17
18=== modified file 'make_agent_json.py'
19--- make_agent_json.py 2016-02-09 19:55:34 +0000
20+++ make_agent_json.py 2016-02-17 15:50:52 +0000
21@@ -12,8 +12,8 @@
22
23
24 supported_windows_releases = (
25- 'win2012', 'win2012hv', 'win2012hvr2', 'win2012r2', 'win7', 'win81',
26- 'win8',
27+ 'win2012', 'win2012hv', 'win2012hvr2', 'win2012r2', 'win2016',
28+ 'win2016nano', 'win7', 'win81', 'win8', 'win10',
29 )
30
31
32
33=== modified file 'tests/test_agent_archive.py'
34--- tests/test_agent_archive.py 2015-08-06 21:30:00 +0000
35+++ tests/test_agent_archive.py 2016-02-17 15:50:52 +0000
36@@ -190,7 +190,7 @@
37 nv_mock.assert_called_with(
38 os.path.abspath('juju-1.21.0-win2012-amd64.tgz'),
39 None, verbose=False)
40- self.assertEqual(7, mock.call_count)
41+ self.assertEqual(10, mock.call_count)
42 output, args, kwargs = mock.mock_calls[0]
43 agent_path = os.path.abspath(cmd_args.source_agent)
44 self.assertEqual(
45@@ -205,7 +205,7 @@
46 's3://juju-qa-data/agent-archive/'
47 'juju-1.21.0-win2012hvr2-amd64.tgz'],
48 args[0])
49- output, args, kwargs = mock.mock_calls[6]
50+ output, args, kwargs = mock.mock_calls[8]
51 self.assertEqual(
52 ['cp',
53 's3://juju-qa-data/agent-archive/juju-1.21.0-win2012-amd64.tgz',

Subscribers

People subscribed via source and target branches