Skip to content

Commit

Permalink
TASK: Update docker setup for end to end tests (#3253)
Browse files Browse the repository at this point in the history
* TASK: Use up to date images for the docker e2e test

* TASK: change images to arm64 versions

To have more performance on apple silicon macs
  • Loading branch information
markusguenther committed Nov 17, 2022
1 parent 56206c5 commit 5d9d09c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 7 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ test-e2e:

## Executes integration tests locally in a docker-compose setup.
test-e2e-docker:
@bash Tests/IntegrationTests/e2e-docker.sh $(or $(browser),chromium)
@bash Tests/IntegrationTests/e2e-docker.sh $(or $(browser),chrome)

## Executes make lint-js and make lint-editorconfig.
lint: lint-js lint-editorconfig
Expand Down
4 changes: 2 additions & 2 deletions Tests/IntegrationTests/docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ version: "3.4"
services:

php:
image: thecodingmachine/php:7.4-v4-cli
image: thecodingmachine/php:8.0-v4-cli-node16
command: tail -f /dev/null
ports:
- 8081:8081
Expand All @@ -13,7 +13,7 @@ services:
PHP_EXTENSION_GD: 1

db:
image: circleci/mariadb:10.2
image: arm64v8/mysql:8
environment:
MYSQL_DATABASE: neos
MYSQL_ROOT_PASSWORD: not_a_real_password
Expand Down
14 changes: 10 additions & 4 deletions Tests/IntegrationTests/e2e-docker.sh
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,8 @@ echo "##########################################################################
echo "# Install dependencies... #"
echo "#############################################################################"
dc exec -T php bash <<-'BASH'
cd /usr/src/app
sudo chown -R docker:docker .
cd TestDistribution
composer install
BASH
Expand Down Expand Up @@ -77,13 +79,17 @@ for fixture in $(pwd)/Tests/IntegrationTests/Fixtures/*/; do
# TODO: optimize this
cd TestDistribution
./flow flow:package:rescan > /dev/null
./flow flow:cache:flush > /dev/null
composer reinstall neos/test-nodetypes
composer reinstall neos/test-site
./flow flow:cache:flush --force
./flow flow:cache:warmup
./flow configuration:show --path Neos.ContentRepository.contentDimensions
if ./flow site:list | grep -q 'Node name'; then
./flow site:prune '*' > /dev/null
./flow site:prune '*'
fi
./flow site:import --package-key=Neos.TestSite
./flow resource:publish > /dev/null
./flow resource:publish
BASH

yarn run testcafe "$1" "${fixture}*.e2e.js" \
Expand Down

0 comments on commit 5d9d09c

Please sign in to comment.