diff options
| author |   xudan <xudan16@huawei.com> | 2018-02-10 22:04:03 -0500 |
|---|---|---|
| committer |   Georg Kunz <georg.kunz@ericsson.com> | 2018-02-19 15:05:39 +0100 |
| commit | 10851a2d74ec28368a97252fa0e21a4171a67f16 (patch) | |
| tree | a5f9d027a4c586806527887fe633fd1c369dda96 /dovetail/container.py | |
| parent | 51a7666d0d50d0ed13c556d97aded50a3e7f30de (diff) | |
Add 3 new HA test cases into proposed_tests test suite
Add 3 new HA test cases into proposed_tests test suite and running them on CI.
For the current 8 HA test cases and 3 other HA test cases plans to add,
do some adaptions for the Yardstick Euphrates release.
1. Don't need the bugfix patch anymore.
2. The data format has changed, and has done some adaptions.
3. For Yardstick Euphrates, if setting OS_INSECURE=True, it needs to set
OS_CACERT=False
4. Test case tc011 needs a image and flavor to create the stack.
JIRA: DOVETAIL-614
JIRA: DOVETAIL-586
Change-Id: I9da8c8316246b9edee0d81ad18422ae6018becaf
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail/container.py')
| -rw-r--r-- | dovetail/container.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/dovetail/container.py b/dovetail/container.py index ca37d810..8069ea47 100644 --- a/dovetail/container.py +++ b/dovetail/container.py @@ -106,6 +106,9 @@ class Container(object): else: cls.logger.error("Can't find any external network.") return None + insecure = os.getenv("OS_INSECURE") + if insecure and insecure.lower() == 'true': + envs = envs + " -e OS_CACERT=False " log_vol = '-v %s:%s ' % (dovetail_config['result_dir'], dovetail_config["yardstick"]['result']['log']) @@ -356,9 +359,9 @@ class Container(object): cls.pre_copy(container_id, src, dest) url = dt_cfg.dovetail_config['report_dest'] if url.startswith("http"): - cmd = ("sed -i '16s#http://127.0.0.1:8000/results#{}#g' {}" + cmd = ("sed -i '17s#http://127.0.0.1:8000/results#{}#g' {}" .format(url, dest)) cls.exec_cmd(container_id, cmd) if url.lower() == 'file': - cmd = ("sed -i '12s/http/file/g' {}".format(dest)) + cmd = ("sed -i '13s/http/file/g' {}".format(dest)) cls.exec_cmd(container_id, cmd) |