You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@mesos.apache.org by al...@apache.org on 2016/04/06 10:29:00 UTC
[2/4] mesos git commit: Added a path to the upgrade test script.
Added a path to the upgrade test script.
In Mesos 0.28.0, MESOS-3608 changed the MESOS_BUILD_DIR environment
variable in the test framework to MESOS_HELPER_DIR, and the location
of the path itself. This patch updates the upgrade script to
accommodate both environment variables.
Review: https://reviews.apache.org/r/45804/
Project: http://git-wip-us.apache.org/repos/asf/mesos/repo
Commit: http://git-wip-us.apache.org/repos/asf/mesos/commit/25409a70
Tree: http://git-wip-us.apache.org/repos/asf/mesos/tree/25409a70
Diff: http://git-wip-us.apache.org/repos/asf/mesos/diff/25409a70
Branch: refs/heads/master
Commit: 25409a70ce1e94ecdc24b092af3574a008707ea7
Parents: 87b5159
Author: Greg Mann <gr...@mesosphere.io>
Authored: Wed Apr 6 10:00:24 2016 +0200
Committer: Alexander Rukletsov <al...@apache.org>
Committed: Wed Apr 6 10:07:58 2016 +0200
----------------------------------------------------------------------
support/test-upgrade.py | 5 +++++
1 file changed, 5 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/mesos/blob/25409a70/support/test-upgrade.py
----------------------------------------------------------------------
diff --git a/support/test-upgrade.py b/support/test-upgrade.py
index 99c8e76..2c4061d 100755
--- a/support/test-upgrade.py
+++ b/support/test-upgrade.py
@@ -77,7 +77,12 @@ class Framework(Process):
# The test-framework can take these parameters as environment variables,
# but not as command-line parameters.
environment = {
+ # In Mesos 0.28.0, the `MESOS_BUILD_DIR` environment variable in the
+ # test framework was changed to `MESOS_HELPER_DIR`, and the '/src'
+ # subdirectory was added to the variable's path. Both are included
+ # here for backwards compatibility.
'MESOS_BUILD_DIR': path,
+ 'MESOS_HELPER_DIR': os.path.join(path, 'src'),
'MESOS_AUTHENTICATE': '1',
'DEFAULT_PRINCIPAL': DEFAULT_PRINCIPAL,
'DEFAULT_SECRET': DEFAULT_SECRET