From b9593541a20e095f15220eed6a31cf4a4fa2fced Mon Sep 17 00:00:00 2001 From: "jose.lausuch" Date: Wed, 3 Feb 2016 14:09:44 +0100 Subject: [PATCH] Fix result directory for functest jjob Also: remove 'running all tests' message Change-Id: I4eedc8d056a288a9c9ab060aea65f613911b5624 Signed-off-by: jose.lausuch --- jjb/functest/functest-ci-jobs.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml index dfc44e3e1..de0592209 100644 --- a/jjb/functest/functest-ci-jobs.yml +++ b/jjb/functest/functest-ci-jobs.yml @@ -221,7 +221,6 @@ if [ "${PUSH_RESULTS_TO_DB}" == "true" ]; then flag="-r" fi - echo "Functest: running all the tests" cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh ${flag}" container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd @@ -253,8 +252,8 @@ envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \ -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \ -e CI_DEBUG=${CI_DEBUG}" - - dir_result="${HOME}/opnfv/functest/results/" + branch=${GIT_BRANCH##*/} + dir_result="${HOME}/opnfv/functest/results/${branch}" mkdir -p ${dir_result} sudo rm -rf ${dir_result}/* res_volume="-v ${dir_result}:/home/opnfv/functest/results" -- 2.16.6