Code Review
/
releng.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Merge "Fix minor yamllint violation for jjb/bottlenecks"
[releng.git]
/
jjb
/
functest
/
set-functest-env.sh
diff --git
a/jjb/functest/set-functest-env.sh
b/jjb/functest/set-functest-env.sh
index
bb79dac
..
b116a85
100755
(executable)
--- a/
jjb/functest/set-functest-env.sh
+++ b/
jjb/functest/set-functest-env.sh
@@
-106,12
+106,6
@@
if [ $(docker ps | grep "${FUNCTEST_IMAGE}:${DOCKER_TAG}" | wc -l) == 0 ]; then
exit 1
fi
exit 1
fi
-if [ "$BRANCH" == 'master' ]; then
- cmd="prepare_env start"
-else
- cmd="python ${FUNCTEST_REPO_DIR}/functest/ci/prepare_env.py start"
-fi
-
-
+cmd="prepare_env start"
echo "Executing command inside the docker: ${cmd}"
docker exec ${container_id} ${cmd}
echo "Executing command inside the docker: ${cmd}"
docker exec ${container_id} ${cmd}