From: Morgan Richomme <morgan.richomme@orange.com>
Date: Thu, 28 Sep 2017 09:17:19 +0000 (+0000)
Subject: Merge "reporting adoption for Euphrates"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=4ba227e8fcd2a5e20bb04ecf9cbc7779f8039f32;hp=2461f04429ade8ec5046e9a0d77cdd11db11e75b;p=releng.git

Merge "reporting adoption for Euphrates"
---

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 @@
 					<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/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)