Merge lp:~abentley/juju-release-tools/update-agent-paths into lp:juju-release-tools

[Aaron Bentley]

Update agent paths, handle new Windows agents.

This branch updates the agent path rewriting and supports new Windows agents.

The new agent paths contain the version, so e.g. "agent/1.25.2/juju-1.25.2-wily-armhf.tgz" rather than "agent/juju-1.25.2-wily-armhf.tgz".

The detection of windows agents has been updated to include win2016, win2016nano and win10.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

=== modified file 'agent_paths.py'
--- agent_paths.py	2016-01-25 16:10:34 +0000
+++ agent_paths.py	2016-02-17 20:57:21 +0000
@@ -21,8 +21,10 @@
     for stanza in stanzas:
         path_hash = stanza['sha256']
         old_hash_urls[path_hash] = stanza['item_url']
-        path = os.path.join('agent', os.path.basename(stanza['path']))
-        path = re.sub('-win(2012(hv)?(r2)?|7|8|81)-', '-windows-', path)
+        agent_filename = stanza['path'].split('/')[-1]
+        path = 'agent/{}/{}'.format(stanza['version'], agent_filename)
+        path = re.sub('-win(2012(hv)?(r2)?|2016(nano)?|7|8|81|10)-',
+                      '-windows-', path)
         paths_hashes.setdefault(path, stanza['sha256'])
         if paths_hashes[path] != path_hash:
             raise ValueError('Conflicting hash')