diff options
author | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-05-21 17:14:13 +0000 |
---|---|---|
committer | Sam Thursfield <sam.thursfield@codethink.co.uk> | 2014-05-21 17:14:13 +0000 |
commit | 56f5ec837287885ad44947671b76350a7c271f62 (patch) | |
tree | d9577c2ca39d6cd649ca635e13d4444cc25262ff | |
parent | 7575459b08a8fb3d28d416225617927ba12101d2 (diff) | |
download | system-tests-56f5ec837287885ad44947671b76350a7c271f62.tar.gz |
-rw-r--r-- | config.py | 8 | ||||
-rw-r--r-- | test_trove_upgrades.py | 14 |
2 files changed, 20 insertions, 2 deletions
@@ -35,6 +35,14 @@ BOOT_TIMEOUT=20 # want to use a custom version of Morph if you're developing a Morph feature. MORPH_COMMAND = 'morph' +# This is a wart. Morph should handle this itself (ideally by having one +# distbuild controller able to divide jobs among workers of many architectures. +DISTBUILD_INITIATORS = { + 'armv7lhf': '10.24.1.134', + 'x86_32': '10.24.1.136', + 'x86_64': '10.24.1.164', +} + BUILD_TEMPDIR = '/src/tmp' BRANCH = 'master' diff --git a/test_trove_upgrades.py b/test_trove_upgrades.py index 596f000..18ec5d9 100644 --- a/test_trove_upgrades.py +++ b/test_trove_upgrades.py @@ -89,12 +89,22 @@ class Deployment(object): self.system_morph_name = system_morph_name self.deploy_morph_name = deploy_morph_name + loader = morphlib.morphloader.MorphologyLoader() + system_morph_file = os.path.join( + self.branch.morphs_dir, system_morph_name + '.morph') + self.system_morph = loader.load_from_file(system_morph_file) + + self.arch = self.system_morph['arch'] + def create_config(self): pass def run_build(self): - run_morph( - ['build', self.system_morph_name], cwd=self.branch.branch_dir) + controller = config.DISTBUILD_INITIATORS[self.arch] + command = [ + 'distbuild', '--controller-initiator-address=%s' % controller, + self.system_morph_name] + run_morph(command, cwd=self.branch.branch_dir) def run_deploy(self, autostart=False): autostart_param = \ |