Merge branch 'baserock/richardmaw/fix-distbuild-v3'

Reviewed-by: Sam Thursfield
Reviewed-by: Richard Ipsum
Reviewed-by: Pedro Alvarez

3 files changed, 34 insertions, 39 deletions

diff --git a/morphlib/plugins/artifact_inspection_plugin.py b/morphlib/plugins/artifact_inspection_plugin.py
index 6eeece77..74645f41 100644
--- a/morphlib/plugins/artifact_inspection_plugin.py
+++ b/morphlib/plugins/artifact_inspection_plugin.py
@@ -1,4 +1,4 @@
-# Copyright (C) 2012-2013  Codethink Limited
+# Copyright (C) 2012-2014 Codethink Limited
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -257,9 +257,6 @@ class ManifestGenerator(object):
 class ArtifactInspectionPlugin(cliapp.Plugin):
 
     def enable(self):
-        self.app.add_subcommand('run-in-artifact',
-                                self.run_in_artifact,
-                                arg_synopsis='ARTIFACT CMD')
         self.app.add_subcommand('generate-manifest',
                                 self.generate_manifest,
                                 arg_synopsis='SYSTEM-ARTIFACT')
@@ -267,35 +264,6 @@ class ArtifactInspectionPlugin(cliapp.Plugin):
     def disable(self):
         pass
 
-    def run_in_artifact(self, args):
-        '''Run a command inside an extracted/mounted chunk or system.
-
-        Command line arguments:
-
-        * `ARTIFACT` is a filename for the artifact.
-        * `CMD` is the command to run.
-
-        run-in-artifact unpacks an artifact, and runs a command in
-        the temporary directory it was unpacked to.
-
-        The command must be given to Morph as a single argument, so
-        use shell quoting appropriately.
-
-        '''
-
-        if len(args) < 2:
-            raise cliapp.AppException(
-                    'run-in-artifact requires arguments: a chunk or '
-                    'system artifact and a a shell command')
-
-        artifact, cmd = args[0], args[1:]
-
-        def run_command_in_dir(dirname):
-            output = self.app.runcmd(cmd, cwd=dirname)
-            self.app.output.write(output)
-
-        call_in_artifact_directory(self.app, artifact, run_command_in_dir)
-
     def generate_manifest(self, args):
         '''Generate a content manifest for a system image.
 
diff --git a/morphlib/plugins/distbuild_plugin.py b/morphlib/plugins/distbuild_plugin.py
index 50ab7eeb..653eeae8 100644
--- a/morphlib/plugins/distbuild_plugin.py
+++ b/morphlib/plugins/distbuild_plugin.py
@@ -103,7 +103,7 @@ class WorkerBuild(cliapp.Plugin):
         self.app.subcommands['gc']([])
 
         arch = artifact.arch
-        bc.build_artifact(artifact, bc.new_build_env(arch))
+        bc.build_source(artifact.source, bc.new_build_env(arch))
 
     def is_system_artifact(self, filename):
         return re.match(r'^[0-9a-fA-F]{64}\.system\.', filename)
@@ -121,6 +121,11 @@ class WorkerDaemon(cliapp.Plugin):
             'listen for connections on PORT',
             default=3434,
             group=group_distbuild)
+        self.app.settings.string(
+            ['worker-daemon-port-file'],
+            'write port used by worker-daemon to FILE',
+            default='',
+            group=group_distbuild)
         self.app.add_subcommand(
             'worker-daemon',
             self.worker_daemon,
@@ -136,7 +141,9 @@ class WorkerDaemon(cliapp.Plugin):
 
         address = self.app.settings['worker-daemon-address']
         port = self.app.settings['worker-daemon-port']
-        router = distbuild.ListenServer(address, port, distbuild.JsonRouter)
+        port_file = self.app.settings['worker-daemon-port-file']
+        router = distbuild.ListenServer(address, port, distbuild.JsonRouter,
+                                        port_file=port_file)
         loop = distbuild.MainLoop()
         loop.add_state_machine(router)
         loop.run()
@@ -156,6 +163,16 @@ class ControllerDaemon(cliapp.Plugin):
             'listen for initiator connections on PORT',
             default=7878,
             group=group_distbuild)
+        self.app.settings.string(
+            ['controller-initiator-port-file'],
+            'write the port to listen for initiator connections to FILE',
+            default='',
+            group=group_distbuild)
+        self.app.settings.string(
+            ['initiator-step-output-dir'],
+            'write build output to files in DIR',
+            default='.',
+            group=group_distbuild)
 
         self.app.settings.string(
             ['controller-helper-address'],
@@ -167,6 +184,11 @@ class ControllerDaemon(cliapp.Plugin):
             'listen for helper connections on PORT',
             default=5656,
             group=group_distbuild)
+        self.app.settings.string(
+            ['controller-helper-port-file'],
+            'write the port to listen for helper connections to FILE',
+            default='',
+            group=group_distbuild)
 
         self.app.settings.string_list(
             ['worker'],
@@ -218,8 +240,10 @@ class ControllerDaemon(cliapp.Plugin):
         listener_specs = [
             # address, port, class to initiate on connection, class init args
             ('controller-helper-address', 'controller-helper-port', 
+             'controller-helper-port-file',
              distbuild.HelperRouter, []),
             ('controller-initiator-address', 'controller-initiator-port',
+             'controller-initiator-port-file',
              distbuild.InitiatorConnection, 
              [artifact_cache_server, morph_instance]),
         ]
@@ -229,11 +253,12 @@ class ControllerDaemon(cliapp.Plugin):
         queuer = distbuild.WorkerBuildQueuer()
         loop.add_state_machine(queuer)
 
-        for addr, port, sm, extra_args in listener_specs:
+        for addr, port, port_file, sm, extra_args in listener_specs:
             addr = self.app.settings[addr]
             port = self.app.settings[port]
+            port_file = self.app.settings[port_file]
             listener = distbuild.ListenServer(
-                addr, port, sm, extra_args=extra_args)
+                addr, port, sm, extra_args=extra_args, port_file=port_file)
             loop.add_state_machine(listener)
 
         for worker in self.app.settings['worker']:
diff --git a/morphlib/plugins/list_artifacts_plugin.py b/morphlib/plugins/list_artifacts_plugin.py
index 8074206b..61c8d160 100644
--- a/morphlib/plugins/list_artifacts_plugin.py
+++ b/morphlib/plugins/list_artifacts_plugin.py
@@ -105,11 +105,13 @@ class ListArtifactsPlugin(cliapp.Plugin):
             self.app.settings, system_artifact.source.morphology['arch'])
         ckc = morphlib.cachekeycomputer.CacheKeyComputer(build_env)
 
-        artifact_files = set()
-        for artifact in system_artifact.walk():
+        for source in set(a.source for a in system_artifact.walk()):
             artifact.cache_key = ckc.compute_key(artifact)
             artifact.cache_id = ckc.get_cache_id(artifact)
 
+        artifact_files = set()
+        for artifact in system_artifact.walk():
+
             artifact_files.add(artifact.basename())
 
             if artifact.source.morphology.needs_artifact_metadata_cached: