diff options
| author |   Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com> | 2016-02-08 13:24:17 +0100 |
|---|---|---|
| committer | Jörgen Karlsson <jorgen.w.karlsson@ericsson.com> | 2016-02-08 12:34:10 +0000 |
| commit | 99b8314550d88cec2e00392827fec58ea96fe54e (patch) | |
| tree | 8dfaa217944465d51b68f16d687e8c8c6a951ff7 | |
| parent | f8795c9a1d0386565a268bc000cd26804781f4a1 (diff) | |
bug fix: wrong POD name used in result dispatchers
Change-Id: I04a300b3478dd075208f9c904dcb281d74089344
Signed-off-by: Jo¶rgen Karlsson <jorgen.w.karlsson@ericsson.com>
(cherry picked from commit 84a5fd5cea31dd957fb1d0283144306e20d8e97b)
| -rwxr-xr-x | ci/prepare_env.sh | 4 | ||||
| -rw-r--r-- | yardstick/dispatcher/http.py | 2 | ||||
| -rw-r--r-- | yardstick/dispatcher/influxdb.py | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/ci/prepare_env.sh b/ci/prepare_env.sh index c00c07943..a51938c80 100755 --- a/ci/prepare_env.sh +++ b/ci/prepare_env.sh @@ -13,7 +13,7 @@ : ${INSTALLER_TYPE:='fuel'} : ${INSTALLER_IP:='10.20.0.2'} -: ${POD_NAME:='opnfv-jump-2'} +: ${NODE_NAME:='opnfv-jump-2'} : ${EXTERNAL_NETWORK:='net04_ext'} # Extract network name from EXTERNAL_NETWORK @@ -32,4 +32,4 @@ if [ ! -f $OPENRC ]; then fi source $OPENRC -export EXTERNAL_NETWORK INSTALLER_TYPE POD_NAME +export EXTERNAL_NETWORK INSTALLER_TYPE NODE_NAME diff --git a/yardstick/dispatcher/http.py b/yardstick/dispatcher/http.py index 90238adf3..f84ad0970 100644 --- a/yardstick/dispatcher/http.py +++ b/yardstick/dispatcher/http.py @@ -49,7 +49,7 @@ class HttpDispatcher(DispatchBase): self.result = { "project_name": "yardstick", "description": "yardstick test cases result", - "pod_name": os.environ.get('POD_NAME', 'unknown'), + "pod_name": os.environ.get('NODE_NAME', 'unknown'), "installer": os.environ.get('INSTALLER_TYPE', 'unknown'), "version": os.environ.get('YARDSTICK_VERSION', 'unknown') } diff --git a/yardstick/dispatcher/influxdb.py b/yardstick/dispatcher/influxdb.py index f61912d72..efa566904 100644 --- a/yardstick/dispatcher/influxdb.py +++ b/yardstick/dispatcher/influxdb.py @@ -65,7 +65,7 @@ class InfluxdbDispatcher(DispatchBase): self.task_id = -1 self.runners_info = {} self.static_tags = { - "pod_name": os.environ.get('POD_NAME', 'unknown'), + "pod_name": os.environ.get('NODE_NAME', 'unknown'), "installer": os.environ.get('INSTALLER_TYPE', 'unknown'), "version": os.environ.get('YARDSTICK_VERSION', 'unknown') } |