Skip to content
This repository has been archived by the owner on Nov 27, 2018. It is now read-only.

Commit

Permalink
Cosmetic
Browse files Browse the repository at this point in the history
  • Loading branch information
lv-develer committed Jan 12, 2015
1 parent 8ac84d8 commit 6a6226d
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions buildbot_travis/loader.py
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -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(
Expand All @@ -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:
Expand Down

0 comments on commit 6a6226d

Please sign in to comment.