From 672dcd6af0de50c026abab58f0483092461b1719 Mon Sep 17 00:00:00 2001 From: Jose Lausuch Date: Fri, 29 Sep 2017 13:41:31 +0200 Subject: [PATCH] [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 --- jjb/functest/set-functest-env.sh | 8 +------- 1 file changed, 1 insertion(+), 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} -- 2.16.6