dovetail tool: Bugfix about the prepare_env of yardstick and get the yardstick.log

1. For Fuel, yardstick prepare_env.sh will fail when
   pwd != /home/opnfv/repos/yardstick
2. Modify yardstick_config.yml in Dovetail to change pwd to that path.
3. Use log file /tmp/yardstick/yardstick.log created by cmd "yardstick task start"
   rather than redirecting the console output to yardstick.log.

JIRA: DOVETAIL-363

Change-Id: Ie0475cfabc66e342be868f0924a5fccd6fa74b58
Signed-off-by: xudan <xudan16@huawei.com>

diff --git a/dovetail/conf/yardstick_config.yml b/dovetail/conf/yardstick_config.yml
index 029100c..91811a2 100644 (file)
--- a/dovetail/conf/yardstick_config.yml
+++ b/dovetail/conf/yardstick_config.yml
@@ -8,20 +8,20 @@ yardstick:
          -e EXTERNAL_NETWORK=ext-net'
   opts: '-id --privileged=true'
   pre_condition:
-    - 'source /home/opnfv/repos/yardstick/tests/ci/prepare_env.sh &&
-         source /home/opnfv/repos/yardstick/tests/ci/clean_images.sh && cleanup'
-    - 'source /home/opnfv/repos/yardstick/tests/ci/prepare_env.sh &&
-         cd /home/opnfv/repos/yardstick && source tests/ci/load_images.sh'
+    - 'cd /home/opnfv/repos/yardstick && source tests/ci/prepare_env.sh &&
+         source tests/ci/clean_images.sh && cleanup'
+    - 'cd /home/opnfv/repos/yardstick && source tests/ci/prepare_env.sh &&
+         source tests/ci/load_images.sh'
   cmds:
     - 'mkdir -p /home/opnfv/yardstick/results/'
     - 'cd /home/opnfv/repos/yardstick && source tests/ci/prepare_env.sh &&
-         yardstick task start tests/opnfv/test_cases/{{validate_testcase}}.yaml
-         --output-file /home/opnfv/yardstick/results/{{validate_testcase}}.out &>
-         /home/opnfv/yardstick/results/yardstick.log'
+         yardstick -d task start tests/opnfv/test_cases/{{validate_testcase}}.yaml
+         --output-file /home/opnfv/yardstick/results/{{validate_testcase}}.out'
   post_condition:
     - ''
   result:
     dir: '/home/opnfv/yardstick/results'
+    log: '/tmp/yardstick'
     store_type: 'file'
     file_path: 'yardstick.log'
     db_url: 'http://testresults.opnfv.org/test/api/v1/results?case=%s&last=1'

diff --git a/dovetail/container.py b/dovetail/container.py
index 4f6975f..4889e51 100644 (file)
--- a/dovetail/container.py
+++ b/dovetail/container.py
@@ -59,8 +59,11 @@ class Container(object):
 
         result_volume = ' -v %s:%s ' % (dovetail_config['result_dir'],
                                         dovetail_config[type]['result']['dir'])
-        cmd = 'sudo docker run %s %s %s %s %s %s /bin/bash' % \
-            (opts, envs, sshkey, openrc, result_volume, docker_image)
+        log_volume = ' -v %s:%s ' % (dovetail_config['result_dir'],
+                                     dovetail_config[type]['result']['log'])
+        cmd = 'sudo docker run %s %s %s %s %s %s %s /bin/bash' % \
+            (opts, envs, sshkey, openrc, result_volume,
+             log_volume, docker_image)
         dt_utils.exec_cmd(cmd, cls.logger)
         ret, container_id = \
             dt_utils.exec_cmd("sudo docker ps | grep " + docker_image +