summaryrefslogtreecommitdiffstats
path: root/dovetail/container.py
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2017-04-21 06:31:33 +0000
committerxudan <xudan16@huawei.com>2017-04-21 09:11:59 +0000
commit5f563a9b99378362a11d9cf1b0fb6c544a9fc077 (patch)
treec15a20c826c9e990efb705ffb495f70ac875f160 /dovetail/container.py
parent56b5afa17e54e789715a5b22711e27a44a25168c (diff)
use Functest tempest_custom test cases to run all Ipv6 test cases
JIRA: DOVETAIL-401 1. modify all Ipv6 test cases, change tempest_smoke_serial/tempest_full_parallel into tempest_custom, add ID of each sub-testcases. 2. Some sub-testcases in ipv6.tc002, ipv6.tc003, ipv6.tc004 and ipv6.tc005 can not be found in the full tempest test case list. 2. disable testcases' script_result_acquired to enable tempest_custom run multiple times. 3. use build_tag-testcase_name(such as daily-master-79a6e392-28bb-4c40-9d88-a03bed99da2d-dovetail.ipv6.tc025) as the unique ID of each testcase. 4. comment out the progress bar, because it has some problems when print the report text. 5. Functest has changed the TEST_DB_URL from http://<testapi>:<port>/apv/v1 to http://<testapi>:<port>/apv/v1/results. 6. Functest has changed the TEST_DB_URL to file://<file_path>/<file_name>. see https://gerrit.opnfv.org/gerrit/#/c/33511/ Change-Id: I524f6702377f215f526158214842481eb44565be Signed-off-by: xudan <xudan16@huawei.com>
Diffstat (limited to 'dovetail/container.py')
-rw-r--r--dovetail/container.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/dovetail/container.py b/dovetail/container.py
index f7912d58..3b040ca9 100644
--- a/dovetail/container.py
+++ b/dovetail/container.py
@@ -63,8 +63,8 @@ class Container(object):
# These are all just used by Functest's function push_results_to_db.
# And has nothing to do with DoveTail running test cases.
- ins_type = " -e INSTALLER_TYPE=vendor-specific"
- scenario = " -e DEPLOY_SCENARIO=default"
+ ins_type = " -e INSTALLER_TYPE=unknown"
+ scenario = " -e DEPLOY_SCENARIO=unknown"
node = " -e NODE_NAME=master"
envs = "%s %s %s" % (ins_type, scenario, node)
@@ -72,8 +72,9 @@ class Container(object):
if dovetail_config['report_dest'].startswith("http"):
report = " -e TEST_DB_URL=%s " % dovetail_config['report_dest']
if dovetail_config['report_dest'] == "file":
- file_path = dovetail_config["functest"]['result']['dir']
- file_path = file_path[0:file_path.rfind('/results')]
+ func_res_conf = dovetail_config["functest"]['result']
+ file_path = os.path.join(func_res_conf['dir'],
+ func_res_conf['file_path'])
report = " -e TEST_DB_URL=file://%s " % file_path
return "%s %s" % (envs, report)
@@ -99,7 +100,7 @@ class Container(object):
return "%s %s" % (envs, log_vol)
@classmethod
- def create(cls, type):
+ def create(cls, type, testcase_name):
sshkey = "-v /root/.ssh/id_rsa:/root/.ssh/id_rsa "
dovetail_config = dt_cfg.dovetail_config
docker_image = cls.get_docker_image(type)
@@ -113,7 +114,8 @@ class Container(object):
# CI_DEBUG is used for showing the debug logs of the upstream projects
# BUILD_TAG is the unique id for this test
envs = ' -e CI_DEBUG=true'
- envs = envs + ' -e BUILD_TAG=%s' % dovetail_config['build_tag']
+ envs = envs + ' -e BUILD_TAG=%s-%s' % (dovetail_config['build_tag'],
+ testcase_name)
config = ""
if type.lower() == "functest":