diff --git a/autotests/bin/runDocker.sh b/autotests/bin/runDocker.sh index 5073dcc4..08d102d5 100755 --- a/autotests/bin/runDocker.sh +++ b/autotests/bin/runDocker.sh @@ -44,8 +44,6 @@ docker run \ --volume $MOUNTDIR:$MOUNTDIR \ --env E2ED_ORIGIN=$E2ED_ORIGIN \ --env E2ED_DEBUG=$E2ED_DEBUG \ - --env E2ED_DOCKER_DO_AFTER_TESTS=$E2ED_DOCKER_DO_AFTER_TESTS \ - --env E2ED_DOCKER_DO_BEFORE_TESTS=$E2ED_DOCKER_DO_BEFORE_TESTS \ --env __INTERNAL_E2ED_PATH_TO_PACK=$1 \ $DOCKER_IMAGE:$VERSION \ & PID=$! diff --git a/bin/dockerEntrypoint.sh b/bin/dockerEntrypoint.sh index 4e73440c..6f629ce8 100755 --- a/bin/dockerEntrypoint.sh +++ b/bin/dockerEntrypoint.sh @@ -10,15 +10,6 @@ restoreE2edPackage () { fi } -doAfterTests() { - if [[ -z $E2ED_DOCKER_DO_AFTER_TESTS ]] - then - echo "No after tests script" - else - ./autotests/bin/$E2ED_DOCKER_DO_AFTER_TESTS - fi -} - onExit() { if [[ $PID ]] && ps -p $PID > /dev/null then @@ -27,7 +18,6 @@ onExit() { fi restoreE2edPackage; - doAfterTests; echo "Exit from docker entrypoint" exit @@ -41,13 +31,6 @@ then mv --verbose ./node_modules/e2ed ./node_modules/_e2ed fi -if [[ -z $E2ED_DOCKER_DO_BEFORE_TESTS ]] -then - echo "No before tests script" -else - ./autotests/bin/$E2ED_DOCKER_DO_BEFORE_TESTS -fi - if [[ -z $E2ED_DEBUG ]] then /node_modules/e2ed/bin/runE2edInDockerEnvironment.js & PID=$!