From 0e2b737225fb181aa36c09789f6b1f5ce1555319 Mon Sep 17 00:00:00 2001
From: "jose.lausuch" <jose.lausuch@ericsson.com>
Date: Mon, 14 Dec 2015 15:51:43 +0100
Subject: [PATCH] Add a docker volume to store rally results

They will be pushed to artifacts from the jumphost

Change-Id: I9560846ee1efb7b653c37238e90e98ac7bf6e76c
Signed-off-by: jose.lausuch <jose.lausuch@ericsson.com>
---
 jjb/functest/functest.yml | 10 ++++++++--
 jjb/functest/res-build.sh |  6 +++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml
index c45fdb2c0..39bbb72ec 100644
--- a/jjb/functest/functest.yml
+++ b/jjb/functest/functest.yml
@@ -148,7 +148,7 @@
         - 'functest-cleanup'
         - 'set-functest-env'
         - 'functest-all'
-#        - 'functest-store-results'
+        - 'functest-store-results'
 
 - builder:
     name: functest-suite-builder
@@ -194,8 +194,14 @@
                 labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds"
             fi
 
+            dir_result="${HOME}/opnfv/functest/reports"
+            mkdir -f ${dir_result}
+            rm -rf ${dir_result}/*
+
+            $res_volume="-v ${dir_result}:/home/opnfv/functest/results"
+
             docker pull opnfv/functest:latest_stable
-            cmd="docker run -id -e $envs ${labconfig} ${sshkey} opnfv/functest:latest_stable /bin/bash"
+            cmd="docker run -id -e $envs ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest_stable /bin/bash"
             echo "Functest: Running docker run command: ${cmd}"
             ${cmd}
             docker ps -a
diff --git a/jjb/functest/res-build.sh b/jjb/functest/res-build.sh
index a9c5dbe1b..9d425773d 100644
--- a/jjb/functest/res-build.sh
+++ b/jjb/functest/res-build.sh
@@ -7,9 +7,9 @@ export PATH=$PATH:/usr/local/bin/
 git_sha1="$(git rev-parse HEAD)"
 res_build_date=$(date -u +"%Y-%m-%d_%H-%M-%S")
 
-# Result directory in the docker file
+# Result directory in the jumphost
 # to be used only with CI
-dir_result="/home/opnfv/functest/results"
+dir_result="${HOME}/opnfv/functest/reports"
 
 # Clean the results directory
 # remove json file for rally, export only html
@@ -20,7 +20,7 @@ rm -f $dir_result/rally/*.json
 # date is generated by functest so on the artifact, the results shall be under functest/<testbed id>/date/
 testbed=$NODE_NAME
 
-project_artifact=functest/$testbed/$res_build_date
+project_artifact=logs/functest/$testbed/$res_build_date
 
 # copy folder to artifact
 if [ -d "$dir_result" ]; then
-- 
2.16.6