Skip to content

Commit

Permalink
Get end to end tests starting again.
Browse files Browse the repository at this point in the history
  • Loading branch information
TimOrtel committed Oct 28, 2024
1 parent 40c2f09 commit a5d6d4c
Show file tree
Hide file tree
Showing 5 changed files with 27 additions and 4 deletions.
8 changes: 7 additions & 1 deletion docker/artemis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ services:
# https://docs.artemis.cit.tum.de/dev/setup/#
image: ghcr.io/ls1intum/artemis:latest
pull_policy: always
volumes:
- artemis-data:/opt/artemis/data
# system environments are the default way for custom configuration overrides in the containerized artemis setups
# either add them in the environments or env_file section (alternative to application-local.yml)
env_file:
Expand All @@ -30,4 +32,8 @@ services:
networks:
artemis:
driver: "bridge"
name: artemis
name: artemis

volumes:
artemis-data:
name: artemis-data
2 changes: 1 addition & 1 deletion docker/artemis_e2e_config.env
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
SPRING_PROFILES_ACTIVE="artemis,scheduling,dev,docker"
SPRING_PROFILES_ACTIVE="artemis,scheduling,dev,docker,core"

SPRING_DATASOURCE_USERNAME="root"
SPRING_DATASOURCE_PASSWORD=""
Expand Down
6 changes: 6 additions & 0 deletions docker/e2e-tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -37,3 +37,9 @@ networks:
artemis:
driver: "bridge"
name: artemis

volumes:
artemis-mysql-data:
name: artemis-mysql-data
artemis-data:
name: artemis-data
10 changes: 9 additions & 1 deletion docker/mysql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,19 @@ services:
mysql:
container_name: artemis-mysql
image: docker.io/library/mysql:9.0.1
volumes:
- artemis-mysql-data:/var/lib/mysql
# DO NOT use this default file for production systems!
environment:
MYSQL_ALLOW_EMPTY_PASSWORD: true
MYSQL_ROOT_PASSWORD: ""
MYSQL_DATABASE: "Artemis"
ports:
- "127.0.0.1:3306:3306"
# expose the port to make it reachable docker internally even if the external port mapping changes
expose:
- "3306"
command: mysqld --lower_case_table_names=1 --skip-ssl --character_set_server=utf8mb4 --collation-server=utf8mb4_unicode_ci --explicit_defaults_for_timestamp
command: mysqld --lower_case_table_names=1 --tls-version='' --character_set_server=utf8mb4 --collation-server=utf8mb4_unicode_ci --explicit_defaults_for_timestamp --max_connections=100000
# mbind: Operation not permitted workaround for docker compose (see https://github.com/docker-library/mysql/issues/303)
cap_add:
- SYS_NICE # CAP_SYS_NICE
Expand All @@ -31,3 +35,7 @@ networks:
artemis:
driver: "bridge"
name: artemis

volumes:
artemis-mysql-data:
name: artemis-mysql-data
5 changes: 4 additions & 1 deletion readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,10 @@ This project is configured to support multiple [flavor dimensions](https://devel
## Tests
We use both unit tests and end-to-end integration tests. Before running the end-to-end tests, consider the licenses section in this readme.
- To run the unit tests, execute `./gradlew test -Dskip.unit-tests=false -Dskip.e2e=true -Dskip.debugVariants=true -Dskip.flavor.unrestricted=true -Dskip.flavor.beta=true`
- To run the end-to-end tests, execute `docker compose -f docker/e2e-tests.yml up artemis-android-e2e`
- To run the end-to-end tests, first start artemis locally in docker:
- `docker compose -f docker/e2e-tests.yml up artemis-app-setup`
- `./gradlew test -Dskip.unit-tests=true -Dskip.e2e=false -Dskip.debugVariants=true -Dskip.flavor.unrestricted=true -Dskip.flavor.beta=true`


## Play store screenshots
Screenshots can be generated using preview-composables in the `debug` source sets. They are annotated with `@PlayStoreScreenshots`. To get the screenshots, right click the rendered preview
Expand Down

0 comments on commit a5d6d4c

Please sign in to comment.