You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by vi...@apache.org on 2016/07/07 14:43:02 UTC
mesos git commit: Fixed parameter names in test-upgrade.py.
Repository: mesos
Updated Branches:
refs/heads/master 554ec1b26 -> 4ec1ef2d9
Fixed parameter names in test-upgrade.py.
Added 'MESOS_AUTHENTICATE_FRAMEWORKS' in env variable when starting
master. Also changed 'mesos-agent.sh' back to 'mesos-slave.sh' since
'slave' is not renamed in 0.28.x.
Review: https://reviews.apache.org/r/49742/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/4ec1ef2d
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/4ec1ef2d
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/4ec1ef2d
Branch: refs/heads/master
Commit: 4ec1ef2d9480593bbf82f73e7dcca9e43ef2ac1b
Parents: 554ec1b
Author: Jay Guo <gu...@cn.ibm.com>
Authored: Thu Jul 7 09:42:49 2016 -0500
Committer: Vinod Kone <vi...@gmail.com>
Committed: Thu Jul 7 09:42:49 2016 -0500
----------------------------------------------------------------------
support/test-upgrade.py | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/4ec1ef2d/support/test-upgrade.py
----------------------------------------------------------------------
diff --git a/support/test-upgrade.py b/support/test-upgrade.py
index 8655a85..84df21d 100755
--- a/support/test-upgrade.py
+++ b/support/test-upgrade.py
@@ -47,7 +47,7 @@ class Process:
class Agent(Process):
def __init__(self, path, work_dir, credfile):
- Process.__init__(self, [os.path.join(path, 'bin', 'mesos-agent.sh'),
+ Process.__init__(self, [os.path.join(path, 'bin', 'mesos-slave.sh'),
'--master=127.0.0.1:5050',
'--credential=' + credfile,
'--work_dir=' + work_dir,
@@ -83,7 +83,11 @@ class Framework(Process):
# here for backwards compatibility.
'MESOS_BUILD_DIR': path,
'MESOS_HELPER_DIR': os.path.join(path, 'src'),
+ # MESOS_AUTHENTICATE is deprecated in favor of
+ # MESOS_AUTHENTICATE_FRAMEWORKS, although 0.28.x still expects
+ # previous one, therefore adding both.
'MESOS_AUTHENTICATE': '1',
+ 'MESOS_AUTHENTICATE_FRAMEWORKS': '1',
'DEFAULT_PRINCIPAL': DEFAULT_PRINCIPAL,
'DEFAULT_SECRET': DEFAULT_SECRET
}