diff options
author | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-06-30 22:03:09 +0200 |
---|---|---|
committer | Cédric Ollivier <cedric.ollivier@orange.com> | 2017-06-30 22:07:44 +0200 |
commit | 7269814b8b79c24c121c6a3e087284c52307a15b (patch) | |
tree | d4b122e200922a1d25a6471216fed4d5ee042580 | |
parent | a7f82c093fab2ad19c7ffb0a81ec5756e91e73ae (diff) |
Directly call Functest console scripts
It conforms jjobs with "Define console_scripts" [1].
[1] https://gerrit.opnfv.org/gerrit/#/c/36781/
Change-Id: I9209e6efa1b493e24135402a46df72aaa14115d1
Signed-off-by: Cédric Ollivier <cedric.ollivier@orange.com>
-rwxr-xr-x | jjb/functest/functest-loop.sh | 2 | ||||
-rwxr-xr-x | jjb/functest/functest-suite.sh | 2 | ||||
-rwxr-xr-x | jjb/functest/set-functest-env.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/jjb/functest/functest-loop.sh b/jjb/functest/functest-loop.sh index 676890644..a590d9f95 100755 --- a/jjb/functest/functest-loop.sh +++ b/jjb/functest/functest-loop.sh @@ -2,7 +2,7 @@ set +e [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r" -cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/run_tests.py -t all ${flags}" +cmd="run_tests -t all ${flags}" container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1) docker exec $container_id $cmd diff --git a/jjb/functest/functest-suite.sh b/jjb/functest/functest-suite.sh index 5d1ed28f5..469a57726 100755 --- a/jjb/functest/functest-suite.sh +++ b/jjb/functest/functest-suite.sh @@ -10,7 +10,7 @@ global_ret_val=0 tests=($(echo $FUNCTEST_SUITE_NAME | tr "," "\n")) for test in ${tests[@]}; do - cmd="python /home/opnfv/repos/functest/functest/ci/run_tests.py -t $test" + cmd="run_tests -t $test" docker exec $container_id $cmd let global_ret_val+=$? done diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh index 558e2487d..01cab5e0f 100755 --- a/jjb/functest/set-functest-env.sh +++ b/jjb/functest/set-functest-env.sh @@ -90,7 +90,7 @@ if [ $(docker ps | grep "${FUNCTEST_IMAGE}:${DOCKER_TAG}" | wc -l) == 0 ]; then exit 1 fi -cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/prepare_env.py start" +cmd="prepare_env start" echo "Executing command inside the docker: ${cmd}" docker exec ${container_id} ${cmd} |