diff options
| author |   jose.lausuch <jose.lausuch@ericsson.com> | 2015-12-15 09:25:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2015-12-15 09:25:46 +0000 |
| commit | b77ebe0250188b956189e43550d2d4ef4e587038 (patch) | |
| tree | 6514fc8c90014b97d69d965b53d8cabdb08e5e2e /jjb | |
| parent | 86edf3422072a7b3f6f4a28c9f046e32fa9d10bf (diff) | |
| parent | 0e2b737225fb181aa36c09789f6b1f5ce1555319 (diff) | |
Merge "Add a docker volume to store rally results"
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/functest/functest.yml | 10 | ||||
| -rw-r--r-- | 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 33f060644..e1dff72e4 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -152,7 +152,7 @@ - 'functest-cleanup' - 'set-functest-env' - 'functest-all' -# - 'functest-store-results' + - 'functest-store-results' - builder: name: functest-suite-builder @@ -204,8 +204,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 |