Merge "Functest: Enable new script prepare_env.py"

diff --git a/jjb/functest/functest-ci-jobs.yml b/jjb/functest/functest-ci-jobs.yml
index a0a1326..20f5f30 100644 (file)
--- 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}