From af15a0cb01a73314dc27bb0b90584eb45dfd77f3 Mon Sep 17 00:00:00 2001 From: Jan-Philip Gehrcke Date: Fri, 30 Nov 2018 13:36:34 +0100 Subject: [PATCH] Use --global when installing enterprise CLI on 1.11/1.10 --- dcos_test_utils/dcos_cli.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/dcos_test_utils/dcos_cli.py b/dcos_test_utils/dcos_cli.py index d9aa429..cab39df 100644 --- a/dcos_test_utils/dcos_cli.py +++ b/dcos_test_utils/dcos_cli.py @@ -155,8 +155,16 @@ def setup_enterprise( "--username={}".format(username), "--password={}".format(password)]) assert stdout == '' assert stderr == '' - self.exec_command( - ["dcos", "package", "install", "dcos-enterprise-cli", "--cli", "--yes"]) + + if '1.11' in DCOS_CLI_URL or '1.10' in DCOS_CLI_URL: + # An attempt to work around + # https://jira.mesosphere.com/browse/DCOS-45738 + cmd = ["dcos", "package", "install", "dcos-enterprise-cli", "--cli", "--global", "--yes"] + else: + cmd = ["dcos", "package", "install", "dcos-enterprise-cli", "--cli", "--yes"] + + self.exec_command(cmd) + def login_enterprise(self, username=None, password=None, provider=None): """ Authenticates the CLI with the setup Mesosphere Enterprise DC/OS cluster