summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMorgan Richomme <morgan.richomme@orange.com>2016-04-29 09:36:12 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-04-29 09:36:13 +0000
commit6e6b84522797ffad0d9342bd45b78246528a4e8e (patch)
treefeb6f8dee0dce63e3ef73ae11a909451ab27d6f8
parentbe56f9bb69c476c3235e6fca2f4cec6e230ae8f1 (diff)
parent46268fd589f2bf3e38534ef2811facf125a2489d (diff)
Merge "Functest: Enable new script prepare_env.py"
-rw-r--r--jjb/functest/functest-ci-jobs.yml9
1 files changed, 4 insertions, 5 deletions
diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index a0a1326ba..20f5f300e 100644
--- a/jjb/functest/functest-ci-jobs.yml
+++ b/jjb/functest/functest-ci-jobs.yml
@@ -222,7 +222,7 @@
#!/bin/bash
set -e
echo "Functest: run $FUNCTEST_SUITE_NAME"
- cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME"
+ cmd="${FUNCTEST_REPO_DIR}/ci/run_tests.py -t $FUNCTEST_SUITE_NAME"
container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
docker exec $container_id $cmd
@@ -232,9 +232,8 @@
- shell: |
#!/bin/bash
set +e
- flags="-s"
- [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+=" -r"
- cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh ${flags}"
+ [[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r"
+ cmd="${FUNCTEST_REPO_DIR}/ci/run_tests.py -t all ${flags}"
container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
docker exec $container_id $cmd
@@ -306,7 +305,7 @@
echo "The container opnfv/functest with ID=${container_id} has not been properly started. Exiting..."
exit 1
fi
- cmd="${FUNCTEST_REPO_DIR}/docker/prepare_env.sh"
+ cmd="python ${FUNCTEST_REPO_DIR}/ci/prepare_env.py start"
echo "Executing command inside the docker: ${cmd}"
docker exec ${container_id} ${cmd}