agw/overleaf-cep
1
0
Fork 0
mirror of https://github.com/yu-i-i/overleaf-cep.git synced 2026-05-23 17:19:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

[web] print mongo logs on acceptance/unit test failure (#28034)

Browse Source 
* [web] print mongo logs on acceptance/unit test failure

* [web] turn on logging for mongo again

* [monorepo] improve printing of mongo logs

Co-authored-by: Gernot Schulz <gernot.schulz@overleaf.com>

* [monorepo] fix waiting for mongo startup

---------

Co-authored-by: Gernot Schulz <gernot.schulz@overleaf.com>
GitOrigin-RevId: 713ffacd1f80b134ef3cb84a8f281660ef54e5d6
This commit is contained in:
Jakob Ackermann
2025-08-21 16:03:14 +02:00
committed by Copybot
parent 63a92b53f1
commit f9c011473b
3 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
server-ce/test/Makefile
View File

@@ -24,13 +24,13 @@ test-e2e-native:
test-e2e:
docker compose build host-admin
docker compose up --detach --wait host-admin
docker compose up --detach --wait mongo || (docker compose logs mongo && exit 42)
docker compose up --no-log-prefix --exit-code-from=e2e e2e host-admin || (docker compose logs mongo && exit 42)
docker compose up --detach --wait mongo || { docker compose logs mongo; exit 42; }
docker compose up --no-log-prefix --exit-code-from=e2e e2e host-admin || { docker compose logs mongo; exit 42; }
test-e2e-open:
docker compose up --detach --wait host-admin
docker compose up --detach --wait mongo || (docker compose logs mongo && exit 42)
docker compose up --no-log-prefix --exit-code-from=e2e-open e2e-open host-admin || (docker compose logs mongo && exit 42)
docker compose up --detach --wait mongo || { docker compose logs mongo; exit 42; }
docker compose up --no-log-prefix --exit-code-from=e2e-open e2e-open host-admin || { docker compose logs mongo; exit 42; }
SHARD_PROJECT_NAMES = \
test-ce-default \

8
services/web/Makefile
View File

@@ -142,7 +142,7 @@ test_unit_module: mongo_migrations_for_tests
$(MAKE) modules/$(MODULE_NAME)/test_unit
mongo_migrations_for_tests:
$(DOCKER_COMPOSE) run --rm test_unit npm run migrations -- migrate -t saas
$(DOCKER_COMPOSE) run --rm test_unit npm run migrations -- migrate -t saas || { $(DOCKER_COMPOSE) logs mongo; exit 42; }
#
# Frontend tests
@@ -214,7 +214,7 @@ test_acceptance_app_server_pro: export COMPOSE_PROJECT_NAME=acceptance_test_serv
test_acceptance_app_server_pro: export OVERLEAF_CONFIG=$(CFG_SERVER_PRO)
$(TEST_ACCEPTANCE_APP):
$(DOCKER_COMPOSE) run --rm test_acceptance
$(DOCKER_COMPOSE) run --rm test_acceptance || { $(DOCKER_COMPOSE) logs mongo; exit 42; }
$(DOCKER_COMPOSE) down -v -t 0
# We are using _make magic_ for turning these file-targets into calls to
@@ -361,7 +361,7 @@ TEST_ACCEPTANCE_MODULES_MERGED_VARIANTS = \
test_acceptance_modules_merged_server_pro \
$(TEST_ACCEPTANCE_MODULES_MERGED_VARIANTS):
$(DOCKER_COMPOSE) run --rm test_acceptance make test_acceptance_modules_merged_inner
$(DOCKER_COMPOSE) run --rm test_acceptance make test_acceptance_modules_merged_inner || { $(DOCKER_COMPOSE) logs mongo; exit 42; }
$(DOCKER_COMPOSE) down -v -t 0
# outer loop for running saas tests in parallel
@@ -382,7 +382,7 @@ test_acceptance_modules_merged_saas_4: export COMPOSE_PROJECT_NAME = \
$(TEST_ACCEPTANCE_MODULES_MERGED_SPLIT_SAAS): export BASE_CONFIG = $(CFG_SAAS)
$(TEST_ACCEPTANCE_MODULES_MERGED_SPLIT_SAAS): test_acceptance_modules_merged_saas_%:
$(DOCKER_COMPOSE) run --rm test_acceptance make test_acceptance_modules_merged_inner_$*
$(DOCKER_COMPOSE) run --rm test_acceptance make test_acceptance_modules_merged_inner_$* || { $(DOCKER_COMPOSE) logs mongo; exit 42; }
$(DOCKER_COMPOSE) down -v -t 0
test_acceptance_modules: $(TEST_ACCEPTANCE_MODULES_MERGED_VARIANTS)

2
services/web/docker-compose.ci.yml
View File

@@ -97,8 +97,6 @@ services:
mongo:
image: mongo:8.0.11
logging:
driver: none
command: --replSet overleaf
volumes:
- ../../bin/shared/mongodb-init-replica-set.js:/docker-entrypoint-initdb.d/mongodb-init-replica-set.js