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

[Curtis Hovey]

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.

[Aaron Bentley (abentley)]

Thank you.

review: Approve

=== modified file 'agent_archive.py'
--- agent_archive.py	2015-08-06 21:31:53 +0000
+++ agent_archive.py	2016-02-17 15:50:52 +0000
@@ -20,9 +20,12 @@
     'juju-{}-win2012hv-amd64.tgz',
     'juju-{}-win2012r2-amd64.tgz',
     'juju-{}-win2012-amd64.tgz',
+    'juju-{}-win2016-amd64.tgz',
+    'juju-{}-win2016nano-amd64.tgz',
     'juju-{}-win7-amd64.tgz',
     'juju-{}-win8-amd64.tgz',
     'juju-{}-win81-amd64.tgz',
+    'juju-{}-win10-amd64.tgz',
 )
 # The versions of agent that may or will exist. The agents will
 # always start with juju, the series will start with "win" and the
 
=== modified file 'make_agent_json.py'
--- make_agent_json.py	2016-02-09 19:55:34 +0000
+++ make_agent_json.py	2016-02-17 15:50:52 +0000
@@ -12,8 +12,8 @@
 
 
 supported_windows_releases = (
-    'win2012', 'win2012hv', 'win2012hvr2', 'win2012r2', 'win7', 'win81',
-    'win8',
+    'win2012', 'win2012hv', 'win2012hvr2', 'win2012r2', 'win2016',
+    'win2016nano', 'win7', 'win81', 'win8', 'win10',
     )
 
 
 
=== modified file 'tests/test_agent_archive.py'
--- tests/test_agent_archive.py	2015-08-06 21:30:00 +0000
+++ tests/test_agent_archive.py	2016-02-17 15:50:52 +0000
@@ -190,7 +190,7 @@
         nv_mock.assert_called_with(
             os.path.abspath('juju-1.21.0-win2012-amd64.tgz'),
             None, verbose=False)
-        self.assertEqual(7, mock.call_count)
+        self.assertEqual(10, mock.call_count)
         output, args, kwargs = mock.mock_calls[0]
         agent_path = os.path.abspath(cmd_args.source_agent)
         self.assertEqual(
@@ -205,7 +205,7 @@
              's3://juju-qa-data/agent-archive/'
              'juju-1.21.0-win2012hvr2-amd64.tgz'],
             args[0])
-        output, args, kwargs = mock.mock_calls[6]
+        output, args, kwargs = mock.mock_calls[8]
         self.assertEqual(
             ['cp',
              's3://juju-qa-data/agent-archive/juju-1.21.0-win2012-amd64.tgz',