diff options
author | Parménides GV <parmegv@sdf.org> | 2015-07-30 09:39:16 +0200 |
---|---|---|
committer | Parménides GV <parmegv@sdf.org> | 2015-07-30 09:39:16 +0200 |
commit | 0aebcd379f789cc149e6b525c5e25f90f71b3dbe (patch) | |
tree | ce0e4b02ccb4ab85ca44584a5f343b85d65294f8 | |
parent | e623a54c3d205c2853a396e59fb1941cd9bdf502 (diff) |
Specify branch for every Git repo.
bitmask_client's default branch is not develop but master, so I needed
to do this.
-rw-r--r-- | master.cfg | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -82,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, namespace, venv_name): +def add_repo_to_factory(factory, repo_name, git_branch, 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" @@ -93,7 +93,7 @@ def add_repo_to_factory(factory, repo_name, namespace, venv_name): 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), + Git(repourl=repo_url, branch=git_branch, workdir=workdir, mode='incremental', method='clean', haltOnFailure=True, name="Pull " + repo_url), ShellCommand(command=['pep8', '--exclude=setup.py,versioneer.py,src._version', '--ignore=E501', '.'],env=sandbox_path,haltOnFailure=False, workdir=workdir, name="pep8 on " + repo_name) ]) if 'soledad.git' in repo_url: @@ -126,7 +126,7 @@ 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, _, namespace, in sorted(REPOS, key = lambda repo: repo[order_repos_index])[0:repo_index]: - add_repo_to_factory(factory, repo_name, namespace, venv_name) + add_repo_to_factory(factory, repo_name, repo_branch, namespace, venv_name) if namespace is not '': factory.addStep(ShellCommand(command=['trial', namespace], env=venv_path_factory, workdir="workdir-" + repo_name, name="trial "+namespace)) |