diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2013-01-08 16:37:48 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2013-01-08 16:37:48 (GMT) |
| commit | 18da28ffee6c4d58384dbf03f070e3e55d8c87ee (patch) | |
| tree | cfe9b1fae25da3904556ef9d2b48ca37ff75aa78 | |
| parent | 3ccd3810238fb5fd34a449c36b9b79409d62a993 (diff) | |
Few fixes
| -rw-r--r-- | fabfile/common.py | 21 | ||||
| -rw-r--r-- | fabfile/master.py | 2 | ||||
| -rw-r--r-- | fabfile/slave.py | 5 |
3 files changed, 20 insertions, 8 deletions
diff --git a/fabfile/common.py b/fabfile/common.py index c998f80..e4ca44b 100644 --- a/fabfile/common.py +++ b/fabfile/common.py @@ -1,3 +1,6 @@ +from fabric.api import local + + instances = {"production": {"master_dir": "master", "slave_dir": "slave", @@ -30,9 +33,17 @@ slave_gateway = "dnarvaez@bender.sugarlabs.org" activate_virtualenv = "source sandbox/bin/activate" +_instance_name = None + + def get_instance_name(): - branch = local("git rev-parse --abbrev-ref HEAD", capture=True) - if branch == "master": - return "production" - else: - return "testing" + global _instance_name + + if _instance_name is None: + branch = local("git rev-parse --abbrev-ref HEAD", capture=True) + if branch == "master": + _instance_name = "production" + else: + _instance_name = "testing" + + return _instance_name diff --git a/fabfile/master.py b/fabfile/master.py index dd70fcf..dda6da8 100644 --- a/fabfile/master.py +++ b/fabfile/master.py @@ -19,7 +19,7 @@ from fabric.api import settings from common import slaves from common import slave_gateway from common import instances - +from common import get_instance_name repos = ["git://git.sugarlabs.org/sugar-buildbot/sugar-buildbot.git", "git://git.sugarlabs.org/sugar-build/sugar-build.git"] diff --git a/fabfile/slave.py b/fabfile/slave.py index 1977bd6..501be90 100644 --- a/fabfile/slave.py +++ b/fabfile/slave.py @@ -15,6 +15,7 @@ from common import slaves from common import slave_gateway from common import instances from common import activate_virtualenv +from common import get_instance_name admin = "Daniel Narvaez <dwnarvaez@gmail.com>" @@ -51,9 +52,9 @@ def create(instance_name=get_instance_name()): name, password)) put(StringIO.StringIO(admin), - os.path.join(instance_info["master_dir", "info", "admin")) + os.path.join(instance_info["master_dir"], "info", "admin")) put(StringIO.StringIO(name), - os.path.join(instance_info["master_dir", "info", "host")) + os.path.join(instance_info["master_dir"], "info", "host")) @task |