Merge lp:~abentley/juju-release-tools/generate-agents-2 into lp:juju-release-tools

[Aaron Bentley]

Generate agents from debs/tarfiles.

This branch updates generate_agents to generate agents and their json.

For debs, it interrogates the deb's control file. For Windows and CentOS, it uses the supplied version number.

[Curtis Hovey (sinzui)]

Thank you.

I was thrown in my first read by the use of the win8 agent. It is made by agent_archive.py during a release CI from the win2012 agent. CI makes and tests the win2012 agent. Lets use it because it is guaranteed to exist during testing.

review: Approve (code)

[lp:~abentley/juju-release-tools/generate-agents-2]

274. By Aaron Bentley on 2016-02-10

Use win2012 tarball instead.

=== modified file 'generate_agents.py'
--- generate_agents.py	2016-02-05 21:24:42 +0000
+++ generate_agents.py	2016-02-10 14:30:46 +0000
@@ -6,17 +6,25 @@
     Namespace,
     )
 from datetime import datetime
+import errno
 import glob
 import os
+import re
 import shutil
 import subprocess
 import sys
+import tarfile
 from urlparse import (
     urlsplit,
     urlunsplit,
     )
 
+from debian import deb822
+
 from agent_archive import get_agents
+from build_package import juju_series
+from make_agent_json import StanzaWriter
+from utils import temp_dir
 
 
 # These are the archives that are searched for matching releases.
@@ -64,6 +72,7 @@
 def parse_args():
     parser = ArgumentParser()
     parser.add_argument('release', help='The juju release to prepare')
+    parser.add_argument('agent_stream', help='The juju agent-stream.')
     parser.add_argument('destination', help='The simplestreams destination')
     parser.add_argument('--upatch', help='Ubuntu patchlevel', default='1')
     return parser.parse_args()
@@ -81,6 +90,74 @@
     return listing.splitlines()
 
 
+def deb_to_agent(deb_path, dest_dir, agent_stream):
+    control_str = subprocess.check_output(['dpkg-deb', '-I', deb_path,
+                                           'control'])
+    control = deb822.Deb822(control_str)
+    control_version = control['Version']
+    base_version = re.sub('-0ubuntu.*$', '', control_version)
+    series = juju_series.get_name_from_package_version(control_version)
+    architecture = control['Architecture']
+    with temp_dir() as work_dir:
+        contents = os.path.join(work_dir, 'contents')
+        os.mkdir(contents)
+        subprocess.check_call(['dpkg-deb', '-x', deb_path, contents])
+        jujud_path = os.path.join(
+            contents, 'usr', 'lib', 'juju-{}'.format(base_version), 'bin',
+            'jujud')
+        basename = 'juju-{}-{}-{}.tgz'.format(base_version, series,
+                                              architecture)
+        agent_filename = os.path.join(work_dir, basename)
+        with tarfile.open(agent_filename, 'w:gz') as tf:
+            tf.add(jujud_path, 'jujud')
+        writer = StanzaWriter.for_ubuntu(
+            juju_series.get_version(series), series, architecture,
+            base_version, agent_filename, agent_stream=agent_stream)
+        writer.write_stanzas()
+        shutil.move(writer.filename, dest_dir)
+        final_agent_path = os.path.join(dest_dir, writer.agent_path)
+        move_create_parent(agent_filename, final_agent_path)
+
+
+def debs_to_agents(dest_debs, agent_stream):
+    for deb_path in glob.glob(os.path.join(dest_debs, '*.deb')):
+        deb_to_agent(deb_path, dest_debs, agent_stream)
+
+
+def move_create_parent(source, target):
+    try:
+        os.makedirs(os.path.dirname(target))
+    except OSError as e:
+        if e.errno != errno.EEXIST:
+            raise
+    shutil.move(source, target)
+
+
+def make_windows_agent(dest_debs, agent_stream, release):
+    source = os.path.join(
+        dest_debs, 'juju-{}-win2012-amd64.tgz'.format(release))
+    target = os.path.join(
+        dest_debs, 'juju-{}-windows-amd64.tgz'.format(release))
+    shutil.copy2(source, target)
+    writer = StanzaWriter.for_windows(
+        release, target, agent_stream=agent_stream)
+    writer.write_stanzas()
+    agent_path = os.path.join(dest_debs, writer.agent_path)
+    move_create_parent(target, agent_path)
+    os.rename(writer.filename, os.path.join(dest_debs, writer.filename))
+
+
+def make_centos_agent(dest_debs, agent_stream, release):
+    tarfile = os.path.join(
+        dest_debs, 'juju-{}-centos7-amd64.tgz'.format(release))
+    writer = StanzaWriter.for_centos(release, tarfile,
+                                     agent_stream=agent_stream)
+    writer.write_stanzas()
+    agent_path = os.path.join(dest_debs, writer.agent_path)
+    shutil.copy2(tarfile, agent_path)
+    os.rename(writer.filename, os.path.join(dest_debs, writer.filename))
+
+
 def main():
     args = parse_args()
     dest_debs = os.path.abspath(os.path.join(args.destination, 'debs'))
@@ -95,6 +172,9 @@
         print("Searching the build archives.")
     retrieve_packages(args.release, args.upatch, archives, dest_debs,
                       s3_config)
+    debs_to_agents(dest_debs, args.agent_stream)
+    make_windows_agent(dest_debs, args.agent_stream, args.release)
+    make_centos_agent(dest_debs, args.agent_stream, args.release)
 
 
 if __name__ == '__main__':