Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[Functest] Fix nits in alpine jobs
[releng.git]
/
jjb
/
functest
/
functest-loop.sh
diff --git
a/jjb/functest/functest-loop.sh
b/jjb/functest/functest-loop.sh
index
7385623
..
00a5f13
100755
(executable)
--- a/
jjb/functest/functest-loop.sh
+++ b/
jjb/functest/functest-loop.sh
@@
-1,18
+1,18
@@
#!/bin/bash
set +e
#!/bin/bash
set +e
-branch=${GIT_BRANCH##*/}
[[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r"
[[ "$PUSH_RESULTS_TO_DB" == "true" ]] && flags+="-r"
-if [
[ ${branch} == *"brahmaputra"* ]
]; then
- cmd="
${FUNCTEST_REPO_DIR}/docker/run_tests.sh -s
${flags}"
+if [
"$BRANCH" == 'master'
]; then
+ cmd="
run_tests -t all
${flags}"
else
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
fi
+
container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
docker exec $container_id $cmd
ret_value=$?
container_id=$(docker ps -a | grep opnfv/functest | awk '{print $1}' | head -1)
docker exec $container_id $cmd
ret_value=$?
-ret_val_file="${HOME}/opnfv/functest/results/${
branch
}/return_value"
+ret_val_file="${HOME}/opnfv/functest/results/${
BRANCH##*/
}/return_value"
echo ${ret_value}>${ret_val_file}
echo ${ret_value}>${ret_val_file}
-exit 0
\ No newline at end of file
+exit 0