From 6a6226dabc58110e1b423a3ba783ca47d1812eab Mon Sep 17 00:00:00 2001 From: Lorenzo Villani Date: Mon, 12 Jan 2015 11:49:57 +0100 Subject: [PATCH] Cosmetic --- buildbot_travis/loader.py | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/buildbot_travis/loader.py b/buildbot_travis/loader.py index 13c5ed7..cdeb98f 100644 --- a/buildbot_travis/loader.py +++ b/buildbot_travis/loader.py @@ -120,19 +120,13 @@ def load(self, config_path): for p in safe_load(config).get("projects", []): self.define_travis_builder(**p) - def get_spawner_slaves(self): - return ['spawner'] - - def get_runner_slaves(self): - return [s.slavename for s in self.config['slaves'] if s.slavename is not 'spawner'] - def define_travis_builder(self, name, repository, branch=None, vcs_type=None, username=None, password=None, subrepos=None): job_name = "%s-job" % name spawner_name = name if not repository.endswith("/"): - repository = repository + "/" + repository += "/" if not username and not password: p = urlparse.urlparse(repository) @@ -182,7 +176,7 @@ def define_travis_builder(self, name, repository, branch=None, vcs_type=None, us self.config['builders'].append(BuilderConfig( name=spawner_name, nextBuild=nextBuild, - slavenames=self.get_spawner_slaves(), + slavenames=["spawner"], properties=self.properties, category="spawner", factory=TravisSpawnerFactory( @@ -209,6 +203,9 @@ def define_travis_builder(self, name, repository, branch=None, vcs_type=None, us self.setup_poller(repository, vcs_type, branch, name, username, password) + def get_runner_slaves(self): + return [s.slavename for s in self.config['slaves'] if s.slavename is not 'spawner'] + def setup_poller(self, repository, vcs_type=None, branch=None, project=None, username=None, password=None): if not vcs_type: