diff options
| author |   xudan <xudan16@huawei.com> | 2017-04-25 08:58:15 +0000 |
|---|---|---|
| committer | xudan <xudan16@huawei.com> | 2017-04-25 09:33:16 +0000 |
| commit | f08a5d3b07e401213afb88f0100786fba6a624ff (patch) | |
| tree | 719c5538c69a09d9ef8f68edabfaa2941d8e64e0 /dovetail/container.py | |
| parent | dfeb31d74c5193956a0e77ad76054fc4aa7b100b (diff) | |
Bugfix: All HA testcases are SSH timeout in CI jobs
JIRA: DOVETAIL-405
1. All HA test cases running in CI are SSH timeout.
2. The reason is that HA test cases need a file pod.yaml providing the info of
each node of Openstack.
3. This pod.yaml should be put in $DOVETAIL_HOME/dovetail/userconfig by users.
4. Dovetail's CI jobs should also do some adaptions. JIRA: DOVETAIL-407
5. modify file .gitignore to ignore directories results/ and userconfig/.
Change-Id: I5c681445ec83c9d67a0151370f5b56840ffe444c
Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail/container.py')
| -rw-r--r-- | dovetail/container.py | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/dovetail/container.py b/dovetail/container.py index 3b040ca9..8e032c75 100644 --- a/dovetail/container.py +++ b/dovetail/container.py @@ -126,11 +126,14 @@ class Container(object): return None # for refstack, support user self_defined configuration - config_volume = "" - if type.lower() == "functest": - config_volume = \ - ' -v %s:%s ' % (dovetail_config['userconfig_dir'], - dovetail_config["functest"]['config']['dir']) + # for yardstick, support pod.yaml configuration + pod_file = os.path.join(dovetail_config['userconfig_dir'], 'pod.yaml') + if type.lower() == "yardstick" and not os.path.exists(pod_file): + cls.logger.error("File %s doesn't exist.", pod_file) + return None + config_volume = \ + ' -v %s:%s ' % (dovetail_config['userconfig_dir'], + dovetail_config["functest"]['config']['dir']) result_volume = ' -v %s:%s ' % (dovetail_config['result_dir'], dovetail_config[type]['result']['dir']) |