Adapt jjb path to new functest repo structure

JIRA: FUNCTEST-525

Change-Id: I613757f98a7b41e924f1334053f83f8966536018
Signed-off-by: Morgan Richomme <morgan.richomme@orange.com>

diff --git a/jjb/functest/functest-loop.sh b/jjb/functest/functest-loop.sh
index 7385623..ab97c35 100755 (executable)
--- a/jjb/functest/functest-loop.sh
+++ b/jjb/functest/functest-loop.sh
@@ -6,7 +6,7 @@ branch=${GIT_BRANCH##*/}
 if [[ ${branch} == *"brahmaputra"* ]]; then
     cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh -s ${flags}"
 else
-    cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t all ${flags}"
+    cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/run_tests.py -t all ${flags}"
 fi
 container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
 docker exec $container_id $cmd
@@ -15,4 +15,4 @@ ret_value=$?
 ret_val_file="${HOME}/opnfv/functest/results/${branch}/return_value"
 echo ${ret_value}>${ret_val_file}
 
-exit 0
\ No newline at end of file
+exit 0

diff --git a/jjb/functest/functest-suite.sh b/jjb/functest/functest-suite.sh
index 7e9fa09..d007c04 100755 (executable)
--- a/jjb/functest/functest-suite.sh
+++ b/jjb/functest/functest-suite.sh
@@ -6,7 +6,7 @@ echo "Functest: run $FUNCTEST_SUITE_NAME on branch ${branch}"
 if [[ ${branch} == *"brahmaputra"* ]]; then
     cmd="${FUNCTEST_REPO_DIR}/docker/run_tests.sh --test $FUNCTEST_SUITE_NAME"
 else
-    cmd="python ${FUNCTEST_REPO_DIR}/ci/run_tests.py -t $FUNCTEST_SUITE_NAME"
+    cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/run_tests.py -t $FUNCTEST_SUITE_NAME"
 fi
 container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
 docker exec $container_id $cmd

diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh
index 1c77702..bbd4a88 100755 (executable)
--- a/jjb/functest/set-functest-env.sh
+++ b/jjb/functest/set-functest-env.sh
@@ -83,7 +83,7 @@ fi
 if [[ ${branch} == *"brahmaputra"* ]]; then
     cmd="${FUNCTEST_REPO_DIR}/docker/prepare_env.sh"
 else
-    cmd="python ${FUNCTEST_REPO_DIR}/ci/prepare_env.py start"
+    cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/prepare_env.py start"
 fi
 echo "Executing command inside the docker: ${cmd}"
 docker exec ${container_id} ${cmd}