Skip to content

Commit

Permalink
Development: Remove cypress (#9267)
Browse files Browse the repository at this point in the history
  • Loading branch information
krusche authored Sep 2, 2024
1 parent 90bf23b commit 833aebf
Show file tree
Hide file tree
Showing 196 changed files with 126 additions and 15,348 deletions.
4 changes: 0 additions & 4 deletions .ci/E2E-tests/cleanup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,8 @@ docker container stop $(docker ps -a -q) || true
docker container rm $(docker ps -a -q) || true
docker volume rm $(docker volume ls -q) || true

docker compose -f ./docker/cypress-E2E-tests-mysql.yml down -v
docker compose -f ./docker/cypress-E2E-tests-postgres.yml down -v
docker compose -f ./docker/playwright-E2E-tests-mysql.yml down -v
docker compose -f ./docker/cypress-E2E-tests-local.yml down -v
docker compose -f ./docker/playwright-E2E-tests-multi-node.yml down -v
docker compose -f ./docker/cypress-E2E-tests-multi-node.yml down -v

# show all running docker containers and volumes after the cleanup to detect issues
echo "SHOW RUNNING Docker containers and volumes:"
Expand Down
37 changes: 3 additions & 34 deletions .ci/E2E-tests/execute.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,8 @@ DB="mysql"

echo "CONFIGURATION:"
echo "$CONFIGURATION"
echo "Test framework:"
echo "$TEST_FRAMEWORK"

if [ "$TEST_FRAMEWORK" = "playwright" ]; then
if [ "$CONFIGURATION" = "mysql" ]; then
if [ "$CONFIGURATION" = "mysql" ]; then
COMPOSE_FILE="playwright-E2E-tests-mysql.yml"
elif [ "$CONFIGURATION" = "postgres" ]; then
COMPOSE_FILE="playwright-E2E-tests-postgres.yml"
Expand All @@ -22,21 +19,6 @@ if [ "$TEST_FRAMEWORK" = "playwright" ]; then
else
echo "Invalid configuration. Please choose among mysql, postgres, mysql-localci or multi-node."
exit 1
fi
else
if [ "$CONFIGURATION" = "mysql" ]; then
COMPOSE_FILE="cypress-E2E-tests-mysql.yml"
elif [ "$CONFIGURATION" = "postgres" ]; then
COMPOSE_FILE="cypress-E2E-tests-postgres.yml"
DB="postgres"
elif [ "$CONFIGURATION" = "local" ]; then
COMPOSE_FILE="cypress-E2E-tests-local.yml"
elif [ "$CONFIGURATION" = "multi-node" ]; then
COMPOSE_FILE="cypress-E2E-tests-multi-node.yml"
else
echo "Invalid configuration. Please choose among mysql, postgres, local or multi-node."
exit 1
fi
fi

echo "Compose file:"
Expand All @@ -51,8 +33,7 @@ export HOST_HOSTNAME=$(hostname)

cd docker
#just pull everything else than artemis-app as we build it later either way
if [ "$TEST_FRAMEWORK" = "playwright" ]; then
if [ "$CONFIGURATION" = "multi-node" ]; then
if [ "$CONFIGURATION" = "multi-node" ]; then
echo "Building for playwright (multi-node)"
docker compose -f $COMPOSE_FILE pull artemis-playwright $DB nginx
docker compose -f $COMPOSE_FILE build --build-arg WAR_FILE_STAGE=external_builder --no-cache --pull artemis-app-node-1 artemis-app-node-2 artemis-app-node-3
Expand All @@ -62,20 +43,8 @@ if [ "$TEST_FRAMEWORK" = "playwright" ]; then
docker compose -f $COMPOSE_FILE pull artemis-playwright $DB nginx
docker compose -f $COMPOSE_FILE build --build-arg WAR_FILE_STAGE=external_builder --no-cache --pull artemis-app
docker compose -f $COMPOSE_FILE up --exit-code-from artemis-playwright
fi
else
if [ "$CONFIGURATION" = "multi-node" ]; then
echo "Building for cypress (multi-node)"
docker compose -f $COMPOSE_FILE pull artemis-cypress $DB nginx
docker compose -f $COMPOSE_FILE build --build-arg WAR_FILE_STAGE=external_builder --no-cache --pull artemis-app-node-1 artemis-app-node-2 artemis-app-node-3
docker compose -f $COMPOSE_FILE up --exit-code-from artemis-cypress
else
echo "Building for cypress"
docker compose -f $COMPOSE_FILE pull artemis-cypress $DB nginx
docker compose -f $COMPOSE_FILE build --build-arg WAR_FILE_STAGE=external_builder --no-cache --pull artemis-app
docker compose -f $COMPOSE_FILE up --exit-code-from artemis-cypress
fi
fi

exitCode=$?
cd ..
echo "Container exit code: $exitCode"
Expand Down
4 changes: 2 additions & 2 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,9 @@ tests:
- changed-files:
- any-glob-to-any-file: src/test/**/*

cypress:
playwright:
- changed-files:
- any-glob-to-any-file: src/test/cypress/**/*
- any-glob-to-any-file: src/test/playwright/**/*

database:
- changed-files:
Expand Down
7 changes: 0 additions & 7 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -188,13 +188,6 @@ data-exports/
/docker/.docker-data/artemis-postgres-data/*
!/docker/.docker-data/artemis-postgres-data/.gitkeep

######################
# Cypress
######################
/src/test/cypress/screenshots/
/src/test/cypress/videos/
/src/test/cypress/build

######################
# Playwright
######################
Expand Down
4 changes: 2 additions & 2 deletions docker/artemis-migration-check-postgres.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@ services:
service: artemis-app
env_file:
- ./artemis/config/postgres.env
- ./artemis/config/cypress.env
- ./artemis/config/cypress-postgres.env
- ./artemis/config/playwright.env
- ./artemis/config/playwright-postgres.env
- ./artemis/config/migration-check.env
depends_on:
postgresql:
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------------------------------------------------
# Artemis configuration overrides for the Cypress E2E Postgres setups
# Artemis configuration overrides for the Playwright E2E Postgres setups
# ----------------------------------------------------------------------------------------------------------------------

SPRING_PROFILES_ACTIVE="artemis,scheduling,localvc,localci,buildagent,core,prod,docker"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------------------------------------------------
# Artemis configuration overrides for the Cypress E2E Postgres setups
# Artemis configuration overrides for the Playwright E2E Postgres setups
# ----------------------------------------------------------------------------------------------------------------------

SPRING_PROFILES_ACTIVE="artemis,scheduling,jenkins,gitlab,core,prod,docker"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# ----------------------------------------------------------------------------------------------------------------------
# Common Artemis configurations for the Cypress E2E MySQL and Postgres setups
# Common Artemis configurations for the Playwright E2E MySQL and Postgres setups
# ----------------------------------------------------------------------------------------------------------------------

SPRING_DATASOURCE_PASSWORD=""
Expand Down
62 changes: 0 additions & 62 deletions docker/cypress-E2E-tests-local.yml

This file was deleted.

134 changes: 0 additions & 134 deletions docker/cypress-E2E-tests-multi-node.yml

This file was deleted.

60 changes: 0 additions & 60 deletions docker/cypress-E2E-tests-mysql.yml

This file was deleted.

Loading

0 comments on commit 833aebf

Please sign in to comment.