summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxudan <xudan16@huawei.com>2018-08-28 04:16:29 -0400
committerDan Xu <xudan16@huawei.com>2018-08-30 08:39:41 +0000
commit3c1848c52e7483219e99f5fe2bf5953c38f9a474 (patch)
tree64cd5fad86a049050c4fefce666e181636fcc43b
parent23ecd96cdec73d4d32daf4fe6e72944956e923ed (diff)
Change Bottlenecks volume mapping
If mapping to host's /tmp, it won't clean all .log and .out files before run a new test. It causes the results file including all previous results. See https://build.opnfv.org/ci/view/dovetail/job/dovetail-apex-baremetal-default-mandatory-master/26/artifact/results/stress_logs/bottlenecks.stress.ping.out/*view*/ It will affect the results check. Mapping to DOVETAIL_HOME/results/bottlenecks, which will always be cleaned before running another test. Change-Id: I22bfc871d6f041ae38308bf8e8f685993a376973 Signed-off-by: xudan <xudan16@huawei.com> (cherry picked from commit e79f851c5b804db5884be05a50bc3ae0abe222b4)
-rw-r--r--dovetail/test_runner.py1
-rw-r--r--etc/conf/bottlenecks_config.yml4
2 files changed, 4 insertions, 1 deletions
diff --git a/dovetail/test_runner.py b/dovetail/test_runner.py
index cb5578b0..9b5114f8 100644
--- a/dovetail/test_runner.py
+++ b/dovetail/test_runner.py
@@ -145,6 +145,7 @@ class DockerRunner(object):
config_item['os_insecure'] = os.getenv("OS_INSECURE")
if 'DEPLOY_SCENARIO' in os.environ:
config_item['deploy_scenario'] = os.environ['DEPLOY_SCENARIO']
+ config_item['dovetail_home'] = os.getenv("DOVETAIL_HOME")
return config_item
def _update_config(self, testcase):
diff --git a/etc/conf/bottlenecks_config.yml b/etc/conf/bottlenecks_config.yml
index 85551317..a7d1f4cd 100644
--- a/etc/conf/bottlenecks_config.yml
+++ b/etc/conf/bottlenecks_config.yml
@@ -3,6 +3,7 @@
{% set validate_testcase = validate_testcase or '' %}
{% set testcase = testcase or '' %}
{% set deploy_scenario = deploy_scenario or 'unknown' %}
+{% set dovetail_home = dovetail_home or '' %}
bottlenecks:
image_name: opnfv/bottlenecks
@@ -11,7 +12,7 @@ bottlenecks:
envs: '-e DEPLOY_SCENARIO={{deploy_scenario}} -e Yardstick_TAG=stable -e OUTPUT_FILE={{testcase}}.out'
volumes:
- '-v /var/run/docker.sock:/var/run/docker.sock'
- - '-v /tmp:/tmp'
+ - '-v {{dovetail_home}}/results/bottlenecks:/tmp'
config:
dir: '/home/opnfv/userconfig'
pre_condition:
@@ -22,6 +23,7 @@ bottlenecks:
- 'mkdir -p /home/opnfv/bottlenecks/results'
- 'cp /tmp/bottlenecks.log /home/opnfv/bottlenecks/results'
- 'cp /tmp/bottlenecks.stress.ping.out /home/opnfv/bottlenecks/results'
+ - 'rm /tmp/yardstick.img'
result:
dir: '/home/opnfv/bottlenecks/results'
openrc: '/tmp/admin_rc.sh'