diff options
| author | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-03-26 11:30:05 +0000 |
|---|---|---|
| committer | Richard Ipsum <richard.ipsum@codethink.co.uk> | 2014-03-26 22:10:01 +0000 |
| commit | 9cbf777d614b8f240ccaa0203e7e3ba40b487f11 (patch) | |
| tree | aa9da2764391176fbc19cd0cf025b55904a71cde | |
| parent | 5933335b7a20626fc1d1a36e98fad2e1ade60ad2 (diff) | |
| download | morph-9cbf777d614b8f240ccaa0203e7e3ba40b487f11.tar.gz | |
UI change: distbuild has its own subcommand
| -rw-r--r-- | morphlib/plugins/build_plugin.py | 46 |
1 files changed, 39 insertions, 7 deletions
diff --git a/morphlib/plugins/build_plugin.py b/morphlib/plugins/build_plugin.py index a58bce20..62009bcd 100644 --- a/morphlib/plugins/build_plugin.py +++ b/morphlib/plugins/build_plugin.py @@ -1,4 +1,4 @@ -# Copyright (C) 2012,2013 Codethink Limited +# Copyright (C) 2012,2013,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 @@ -28,9 +28,37 @@ class BuildPlugin(cliapp.Plugin): arg_synopsis='(REPO REF FILENAME)...') self.app.add_subcommand('build', self.build, arg_synopsis='SYSTEM') + self.app.add_subcommand('distbuild', self.distbuild, + arg_synopsis='SYSTEM') + self.use_distbuild = False def disable(self): - pass + self.use_distbuild = False + + def distbuild(self, args): + '''Distbuild a system image in the current system branch + + Command line arguments: + + * `SYSTEM` is the name of the system to build. + + This command launches a distributed build, to use this command + you must first set up a distbuild cluster. + + Artifacts produced during the build will be stored on your trove. + + Once the build completes you can use morph deploy to the deploy + your system, the system artifact will be copied from your trove + and cached locally. + + Example: + + morph distbuild devel-system-x86_64-generic + + ''' + + self.use_distbuild = True + self.build(args) def build_morphology(self, args): '''Build a system, outside of a system branch. @@ -65,8 +93,6 @@ class BuildPlugin(cliapp.Plugin): self.app.settings['cachedir-min-space']) build_command = morphlib.buildcommand.BuildCommand(self.app) - build_command = self.app.hookmgr.call('new-build-command', - build_command) build_command.build(args) def build(self, args): @@ -114,9 +140,15 @@ class BuildPlugin(cliapp.Plugin): build_uuid = uuid.uuid4().hex - build_command = morphlib.buildcommand.BuildCommand(self.app) - build_command = self.app.hookmgr.call('new-build-command', - build_command) + if self.use_distbuild: + addr = self.app.settings['controller-initiator-address'] + port = self.app.settings['controller-initiator-port'] + + build_command = morphlib.buildcommand.InitiatorBuildCommand( + self.app, addr, port) + else: + build_command = morphlib.buildcommand.BuildCommand(self.app) + loader = morphlib.morphloader.MorphologyLoader() push = self.app.settings['push-build-branches'] name = morphlib.git.get_user_name(self.app.runcmd) |