diff options
author | Parménides GV <parmegv@sdf.org> | 2015-07-30 08:35:31 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-07-30 09:00:24 +0200 |
commit | 37d7054d4d3934b158dc85f0b792cf2562421d88 (patch) | |
tree | b70b8907ec0159191db964f04f65cb0cfade6e7a | |
parent | 4cfc07a01538e328ba324f98eef78849147ead30 (diff) |
Calculate repo url from repo_name with method
We simplify the REPOS list.
-rw-r--r-- | master.cfg | 28 |
1 files changed, 16 insertions, 12 deletions
@@ -39,16 +39,19 @@ c['protocols'] = {'pb': {'port': PORT_MASTER}} # about source code changes. github_repos_username = 'leapcode' -github_repos_beginning = 'https://github.com/' + github_repos_username + '/' default_branch = 'develop' -order_repos_index = 3 +order_repos_index = 2 REPOS=[ - ('leap_pycommon', default_branch, github_repos_beginning + 'leap_pycommon.git', 1, 'leap.common'), - ('soledad', default_branch, github_repos_beginning + 'soledad.git', 2, 'leap.soledad'), - ('keymanager', default_branch, github_repos_beginning + 'keymanager.git', 3, 'leap.keymanager'), - ('leap_mail', default_branch, github_repos_beginning + 'leap_mail.git', 4, 'leap.mail') + ('leap_pycommon', default_branch, 1, 'leap.common'), + ('soledad', default_branch, 2, 'leap.soledad'), + ('keymanager', default_branch, 3, 'leap.keymanager'), + ('leap_mail', default_branch, 4, 'leap.mail'), + ('bitmask_client', default_branch, 4, 'leap.bitmask'), ] +def github_repo_url(repo_name): + return 'https://github.com/' + github_repos_username + '/' + repo_name + '.git' + ####### SCHEDULERS # Configure the Schedulers, which decide how to react to incoming changes. @@ -58,10 +61,10 @@ from buildbot.schedulers.forcesched import ForceScheduler from buildbot.changes.filter import ChangeFilter c['schedulers'] = [] -for repo_name, repo_branch, repo_url, _, _ in REPOS: +for repo_name, repo_branch, _, _ in REPOS: c['schedulers'].append(AnyBranchScheduler( name=repo_name, - change_filter = ChangeFilter(repository=repo_url), + change_filter = ChangeFilter(repository=github_repo_url(repo_name)), builderNames=['builder_' + repo_name])) c['schedulers'].append(ForceScheduler( @@ -79,7 +82,7 @@ from buildbot.steps.source.git import Git from buildbot.steps.shell import ShellCommand from buildbot.config import BuilderConfig -def add_repo_to_factory(factory, repo_name, repo_url, namespace, venv_name): +def add_repo_to_factory(factory, repo_name, namespace, venv_name): install_requirements = 'pkg/pip_install_requirements.sh' install_requirements_tests = "if [ -f pkg/requirements-testing.pip ]; then pip install --upgrade -r pkg/requirements-testing.pip; fi" install = "python setup.py develop" @@ -87,6 +90,7 @@ def add_repo_to_factory(factory, repo_name, repo_url, namespace, venv_name): workdir = "workdir-" + repo_name sandbox_path = {'PATH': "../" + venv_name + '/bin/' + ':${PATH}'} sandbox_path_soledad = {'PATH': "../../" + venv_name + '/bin/' + ':${PATH}'} + repo_url = github_repo_url(repo_name) factory.addSteps([ Git(repourl=repo_url, workdir=workdir, mode='incremental', method='clean', haltOnFailure=True, name="Pull " + repo_url), @@ -121,8 +125,8 @@ def create_builder(repo_name): ]) repo_index = [repo[order_repos_index] for repo in REPOS if repo[0] is repo_name][0] - for repo_name, repo_branch, repo_url, _, namespace, in sorted(REPOS, key = lambda repo: repo[order_repos_index])[0:repo_index]: - add_repo_to_factory(factory, repo_name, repo_url, namespace, venv_name) + for repo_name, repo_branch, _, namespace, in sorted(REPOS, key = lambda repo: repo[order_repos_index])[0:repo_index]: + add_repo_to_factory(factory, repo_name, namespace, venv_name) if namespace is not '': factory.addStep(ShellCommand(command=['trial', namespace], env=venv_path_factory, workdir="workdir-" + repo_name, name="trial "+namespace)) @@ -131,7 +135,7 @@ def create_builder(repo_name): c['builders'] = [] -for repo_name, _, _, _, _ in REPOS: +for repo_name, _, _, _ in REPOS: c['builders'].append(create_builder(repo_name)) ####### STATUS TARGETS |