Merge lp:~abentley/juju-release-tools/arbitrary-stream into lp:juju-release-tools

[Aaron Bentley]

set_stream supports full agent-stream, not just revision-build.

This branch changes set_stream to support full agent-stream.

This script sets the content-id for the supplied items. It was initially used by the parallel-streams job and later the assemble-parallel-streams-job, to create copies of the released stream tools with the revision-build content-id.

Now we want to use it when promoting "proposed" agent versions to "released", so we need to be able to specify the full agent stream (but still not the full content-id!).

This branch does that. An initial version was cowboyed into place to support update-streams-release-proposed.

The --update-path functionality was used only by parallel-streams and is a candidate to be removed in a future update.

[lp:~abentley/juju-release-tools/arbitrary-stream]

279. By Aaron Bentley on 2016-02-29

set_stream supports full agent-stream, not just revision-build.

[Curtis Hovey (sinzui)]

Thank you.

review: Approve (code)

[lp:~abentley/juju-release-tools/arbitrary-stream]

280. By Aaron Bentley on 2016-02-29

Fix lint.

=== modified file 'agent_paths.py'
--- agent_paths.py	2016-02-17 20:56:06 +0000
+++ agent_paths.py	2016-02-29 19:56:36 +0000
@@ -1,7 +1,6 @@
 #!/usr/bin/env python3
 from argparse import ArgumentParser
 import json
-import os.path
 import re
 import sys
 

=== modified file 'set_stream.py'
--- set_stream.py	2016-01-25 16:10:34 +0000
+++ set_stream.py	2016-02-29 19:56:36 +0000
@@ -9,21 +9,35 @@
 
 def main():
     parser = ArgumentParser()
-    parser.add_argument('in_file')
-    parser.add_argument('out_file')
-    parser.add_argument('revision_build')
-    parser.add_argument('--update-path', action='store_true')
+    parser.add_argument('in_file', metavar='IN-FILE',
+                        help='The file to read.')
+    parser.add_argument('out_file', metavar='OUT-FILE',
+                        help='The file to write.')
+    parser.add_argument(
+        'stream_id', metavar="STREAM-ID",
+        help='The new stream for the items.  By default, a revision-build'
+        ' stream.')
+    parser.add_argument(
+        '--update-path', action='store_true',
+        help='Update the path to put the agent in "agent/STREAM"')
+    parser.add_argument(
+        '--agent-stream', action='store_true',
+        help='Interpret STREAM-ID as an agent-stream value, not a'
+        ' revision build.')
     args = parser.parse_args()
     with open(args.in_file) as in_file:
         stanzas = json.load(in_file)
-    stream = 'revision-build-{}'.format(args.revision_build)
+    if args.agent_stream:
+        stream = args.stream_id
+    else:
+        stream = 'revision-build-{}'.format(args.stream_id)
+    content_id = 'com.ubuntu.juju:{}:tools'.format(stream)
     for stanza in stanzas:
-        stanza['content_id'] = 'com.ubuntu.juju:{}:tools'.format(stream)
+        stanza['content_id'] = content_id
         if not args.update_path:
             continue
         path = os.path.join(
-            'agent', 'revision-build-{}'.format(args.revision_build),
-            os.path.basename(stanza['path']))
+            'agent', stream, os.path.basename(stanza['path']))
         stanza['path'] = path
     json_dump(stanzas, args.out_file)