summaryrefslogtreecommitdiffstats
path: root/jjb/functest
diff options
context:
space:
mode:
authorJose Lausuch <jalausuch@suse.com>2017-09-29 13:41:31 +0200
committerJose Lausuch <jalausuch@suse.com>2017-09-29 12:20:57 +0000
commit672dcd6af0de50c026abab58f0483092461b1719 (patch)
treed10c08d7781f719e9092d56728c2f0142f997df3 /jjb/functest
parent924e1f3fbde9aea8f7c371ebf52d91103930b968 (diff)
[Functest] Remove former way to execute prepare_env
It was used in Danube and there are no more Functest jobs that are runnign stable/danube branch. Change-Id: I8e8b1f769b76ad511af6086b7a21dd9ae94404f0 Signed-off-by: Jose Lausuch <jalausuch@suse.com>
Diffstat (limited to 'jjb/functest')
-rwxr-xr-xjjb/functest/set-functest-env.sh8
1 files changed, 1 insertions, 7 deletions
diff --git a/jjb/functest/set-functest-env.sh b/jjb/functest/set-functest-env.sh
index bb79dacbe..b116a8528 100755
--- 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
-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}