diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2013-01-08 21:44:50 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2013-01-08 21:44:50 (GMT) |
| commit | 0e899ec7495c2f8ee6d87e061d237e08c16a2fde (patch) | |
| tree | 04cf1ce9da0144157d9fd02ea7eb32da38842071 | |
| parent | 6ad7458ca59b427f91ef53e927e9754db6f7e1e2 (diff) | |
Checkout the right branches
| -rw-r--r-- | fabfile/common.py | 2 | ||||
| -rw-r--r-- | fabfile/master.py | 11 |
2 files changed, 9 insertions, 4 deletions
diff --git a/fabfile/common.py b/fabfile/common.py index 7732353..f29c0b4 100644 --- a/fabfile/common.py +++ b/fabfile/common.py @@ -5,6 +5,7 @@ instances = {"production": {"master_dir": "master", "slave_dir": "slave", "sandbox_dir": "sandbox", + "branch": "master", "config": {"distribute": True, "nightly_builds": True, @@ -15,6 +16,7 @@ instances = {"production": {"master_dir": "master-testing", "slave_dir": "slave-testing", "sandbox_dir": "sandbox-testing", + "branch": "testing", "config": {"branch": "testing", "check_system": False, diff --git a/fabfile/master.py b/fabfile/master.py index d46f6ef..36f72c1 100644 --- a/fabfile/master.py +++ b/fabfile/master.py @@ -22,8 +22,6 @@ from common import instances from common import get_instance_name from common import get_virtualenv_activate -repos = ["git://git.sugarlabs.org/sugar-buildbot/sugar-buildbot.git", - "git://git.sugarlabs.org/sugar-build/sugar-build.git"] env.roledefs["master"] = ["dnarvaez@shell.sugarlabs.org"] @@ -62,8 +60,13 @@ def update(instance_name=get_instance_name()): sudo("mkdir ~/git") with cd("~/git"): - for url in repos: - sudo("git clone %s" % url) + url = "git://git.sugarlabs.org/sugar-buildbot/sugar-buildbot.git" + sudo("git clone %s" % url) + sudo("git checkout %s" % instance_info["branch"]) + + config = instance_info["config"] + sudo("git clone %s" % config["repo"]) + sudo("git checkout %s" % config["branch"]) with cd("~/git/sugar-buildbot"): sudo("cp *.py master.cfg ~/%s" % instance_info["master_dir"]) |