Skip to content

Commit

Permalink
FI-1028: remove E2ED_DOCKER_DO_* params
Browse files Browse the repository at this point in the history
  • Loading branch information
nnn3d committed Nov 29, 2023
1 parent dc29643 commit 15794d3
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 19 deletions.
2 changes: 0 additions & 2 deletions autotests/bin/runDocker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=$!
Expand Down
17 changes: 0 additions & 17 deletions bin/dockerEntrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -27,7 +18,6 @@ onExit() {
fi

restoreE2edPackage;
doAfterTests;

echo "Exit from docker entrypoint"
exit
Expand All @@ -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=$!
Expand Down

0 comments on commit 15794d3

Please sign in to comment.