summaryrefslogtreecommitdiffstats
path: root/ci
diff options
context:
space:
mode:
authorboucherv <valentin.boucher@orange.com>2016-07-27 14:57:58 +0200
committerJose Lausuch <jose.lausuch@ericsson.com>2016-07-28 08:40:29 +0000
commit932e23880ad613098ba518dc1fbf84e65db434a9 (patch)
tree58f5c2a998a2044da4496dacd0bcc15a5081c7b0 /ci
parent1a45b9e69357bfd6228cd862d48d709101fd40da (diff)
Add endpoint type support on functest
By default public endpoint was used but now you can use internal or admin JIRA: FUNCTEST-387 Change-Id: If1adaa88248d379ad6d74b20f2dffd76278b67b9 Signed-off-by: boucherv <valentin.boucher@orange.com>
Diffstat (limited to 'ci')
-rwxr-xr-xci/prepare_env.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/ci/prepare_env.py b/ci/prepare_env.py
index ed6a4ed5f..e31afd495 100755
--- a/ci/prepare_env.py
+++ b/ci/prepare_env.py
@@ -18,6 +18,7 @@ import os
import re
import subprocess
import sys
+import json
import functest.utils.functest_logger as ft_logger
import functest.utils.functest_utils as ft_utils
@@ -206,8 +207,11 @@ def install_rally():
ft_utils.execute_command(cmd, logger=logger, exit_on_error=False,
error_msg=("Deployment %s does not exist."
% DEPLOYMENT_MAME), verbose=False)
-
- cmd = "rally deployment create --fromenv --name=" + DEPLOYMENT_MAME
+ rally_conf = os_utils.get_credentials_for_rally()
+ with open('rally_conf.json', 'w') as fp:
+ json.dump(rally_conf, fp)
+ cmd = "rally deployment create --file=rally_conf.json --name="
+ cmd += DEPLOYMENT_MAME
ft_utils.execute_command(cmd, logger,
error_msg="Problem creating Rally deployment")