Merge "Push yardstick debug log into the artifacts"

diff --git a/yardstick/__init__.py b/yardstick/__init__.py
index 3ae915c..fbbc101 100644 (file)
--- a/yardstick/__init__.py
+++ b/yardstick/__init__.py
@@ -13,12 +13,15 @@ import os
 import sys
 
 import yardstick.vTC.apexlake as apexlake
+from yardstick.common import constants
+from yardstick.common import utils as yardstick_utils
 
 # Hack to be able to run apexlake unit tests
 # without having to install apexlake.
 sys.path.append(os.path.dirname(apexlake.__file__))
 
-LOG_FILE = '/tmp/yardstick.log'
+yardstick_utils.makedirs(constants.YARDSTICK_LOG_DIR)
+LOG_FILE = os.path.join(constants.YARDSTICK_LOG_DIR, 'yardstick.log')
 LOG_FORMATTER = ('%(asctime)s '
                  '%(name)s %(filename)s:%(lineno)d '
                  '%(levelname)s %(message)s')

diff --git a/yardstick/common/constants.py b/yardstick/common/constants.py
index e6faf68..e068c0b 100644 (file)
--- a/yardstick/common/constants.py
+++ b/yardstick/common/constants.py
@@ -35,6 +35,8 @@ TESTCASE_DIR = join(YARDSTICK_ROOT_PATH, 'tests/opnfv/test_cases/')
 
 YARDSTICK_REPOS_DIR = '/home/opnfv/repos/yardstick'
 
+YARDSTICK_LOG_DIR = '/tmp/yardstick/'
+
 YARDSTICK_CONFIG_DIR = '/etc/yardstick/'
 
 YARDSTICK_CONFIG_FILE = join(YARDSTICK_CONFIG_DIR, 'yardstick.conf')