From: chenjiankun <chenjiankun1@huawei.com>
Date: Tue, 26 Sep 2017 06:27:26 +0000 (+0000)
Subject: reporting adoption for Euphrates
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=10181b6e823a8bdd2804afacf99605e16224b629;p=releng-testresults.git

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 <chenjiankun1@huawei.com>
---

diff --git a/reporting/docker/Dockerfile b/reporting/docker/Dockerfile
index f235790..07440ad 100644
--- a/reporting/docker/Dockerfile
+++ b/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/reporting/docker/reporting.sh b/reporting/docker/reporting.sh
index 6cc7a7c..25d3ef1 100755
--- a/reporting/docker/reporting.sh
+++ b/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/reporting/html/euphrates.html b/reporting/html/euphrates.html
index 86258ac..ff7061b 100644
--- a/reporting/html/euphrates.html
+++ b/reporting/html/euphrates.html
@@ -35,7 +35,7 @@
 					<div id="main">
 						<div class="inner">
 							<header>
-								<h1>Danube reporting</h1>
+								<h1>Euphrates reporting</h1>
 							</header>
 							<section class="tiles">
 								<article class="style3">
diff --git a/reporting/reporting/yardstick/scenarios.py b/reporting/reporting/yardstick/scenarios.py
index 26e8c8b..7504493 100644
--- a/reporting/reporting/yardstick/scenarios.py
+++ b/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)