From eed4094e4c25882ceb90503328b3828fb495e67a Mon Sep 17 00:00:00 2001 From: chenjiankun Date: Tue, 26 Sep 2017 06:27:26 +0000 Subject: reporting adoption for Euphrates Danube -> Euphrates in euphrates.html add euphrates dir fix CONFIG_REPORTING_YAML value fix import error in scenario.py Change-Id: Ic0457bf8d1c67bd21ef6a31564792eb98cfca9ad Signed-off-by: chenjiankun --- utils/test/reporting/docker/Dockerfile | 2 +- utils/test/reporting/docker/reporting.sh | 2 +- utils/test/reporting/html/euphrates.html | 2 +- utils/test/reporting/reporting/yardstick/scenarios.py | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) (limited to 'utils/test') diff --git a/utils/test/reporting/docker/Dockerfile b/utils/test/reporting/docker/Dockerfile index f2357909d..07440ad29 100644 --- a/utils/test/reporting/docker/Dockerfile +++ b/utils/test/reporting/docker/Dockerfile @@ -22,7 +22,7 @@ ARG BRANCH=master ENV HOME /home/opnfv ENV working_dir ${HOME}/releng/utils/test/reporting -ENV CONFIG_REPORTING_YAML ${working_dir}/reporting.yaml +ENV CONFIG_REPORTING_YAML ${working_dir}/reporting/reporting.yaml WORKDIR ${HOME} # Packaged dependencies diff --git a/utils/test/reporting/docker/reporting.sh b/utils/test/reporting/docker/reporting.sh index 6cc7a7c9e..25d3ef117 100755 --- a/utils/test/reporting/docker/reporting.sh +++ b/utils/test/reporting/docker/reporting.sh @@ -3,7 +3,7 @@ export PYTHONPATH="${PYTHONPATH}:./reporting" export CONFIG_REPORTING_YAML=./reporting/reporting.yaml -declare -a versions=(danube master) +declare -a versions=(euphrates danube master) declare -a projects=(functest storperf yardstick qtip vsperf bottlenecks) project=$1 diff --git a/utils/test/reporting/html/euphrates.html b/utils/test/reporting/html/euphrates.html index 86258ac23..ff7061b4a 100644 --- a/utils/test/reporting/html/euphrates.html +++ b/utils/test/reporting/html/euphrates.html @@ -35,7 +35,7 @@
-

Danube reporting

+

Euphrates reporting

diff --git a/utils/test/reporting/reporting/yardstick/scenarios.py b/utils/test/reporting/reporting/yardstick/scenarios.py index 26e8c8bb0..7504493b2 100644 --- a/utils/test/reporting/reporting/yardstick/scenarios.py +++ b/utils/test/reporting/reporting/yardstick/scenarios.py @@ -9,7 +9,7 @@ import requests import yaml -import utils.reporting_utils as rp_utils +import reporting.utils.reporting_utils as rp_utils yardstick_conf = rp_utils.get_config('yardstick.test_conf') response = requests.get(yardstick_conf) -- cgit 1.2.3-korg