From 4954c738daaedc34746e2a17e2042519aef90fc5 Mon Sep 17 00:00:00 2001 From: Andrew Rumble Date: Fri, 1 May 2026 09:03:48 +0100 Subject: [PATCH] Merge pull request #33328 from overleaf/ar-handle-more-than-40-saas-modules [web] make sure acceptance tests run when there are more than 40 modules GitOrigin-RevId: 6aad027448f2dcdc5c0a8e0bbd4120c514b9a0ca --- services/web/Makefile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/services/web/Makefile b/services/web/Makefile index 508fb10558..128dadebcd 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -64,6 +64,7 @@ SHARD_PROJECT_NAMES = \ acceptance_test_modules_merged_saas_2_$(BUILD_DIR_NAME) \ acceptance_test_modules_merged_saas_3_$(BUILD_DIR_NAME) \ acceptance_test_modules_merged_saas_4_$(BUILD_DIR_NAME) \ + acceptance_test_modules_merged_saas_5_$(BUILD_DIR_NAME) \ acceptance_test_modules_merged_server_ce_$(BUILD_DIR_NAME) \ acceptance_test_modules_merged_server_pro_$(BUILD_DIR_NAME) \ frontend_test_$(BUILD_DIR_NAME) \ @@ -378,16 +379,18 @@ test_acceptance_modules_merged_inner: # inner loop for running saas tests in parallel no_more_targets: -# If we ever have more than 40 modules, we need to add _5 targets to all the places and have it START at 41. +# If we ever have more than 50 modules, we need to add _6 targets to all the places and have it START at 51. test_acceptance_modules_merged_inner_1: export START=1 test_acceptance_modules_merged_inner_2: export START=11 test_acceptance_modules_merged_inner_3: export START=21 test_acceptance_modules_merged_inner_4: export START=31 +test_acceptance_modules_merged_inner_5: export START=41 TEST_ACCEPTANCE_MODULES_MERGED_INNER_SPLIT = \ test_acceptance_modules_merged_inner_1 \ test_acceptance_modules_merged_inner_2 \ test_acceptance_modules_merged_inner_3 \ test_acceptance_modules_merged_inner_4 \ + test_acceptance_modules_merged_inner_5 \ # The node script prints one module per line. # Using tail and head we skip over the first n=START entries and print the last 10. @@ -433,6 +436,7 @@ TEST_ACCEPTANCE_MODULES_MERGED_SPLIT_SAAS = \ test_acceptance_modules_merged_saas_2 \ test_acceptance_modules_merged_saas_3 \ test_acceptance_modules_merged_saas_4 \ + test_acceptance_modules_merged_saas_5 \ test_acceptance_modules_merged_saas_1: export COMPOSE_PROJECT_NAME = \ acceptance_test_modules_merged_saas_1_$(BUILD_DIR_NAME) @@ -442,6 +446,8 @@ test_acceptance_modules_merged_saas_3: export COMPOSE_PROJECT_NAME = \ acceptance_test_modules_merged_saas_3_$(BUILD_DIR_NAME) test_acceptance_modules_merged_saas_4: export COMPOSE_PROJECT_NAME = \ acceptance_test_modules_merged_saas_4_$(BUILD_DIR_NAME) +test_acceptance_modules_merged_saas_5: export COMPOSE_PROJECT_NAME = \ + acceptance_test_modules_merged_saas_5_$(BUILD_DIR_NAME) $(TEST_ACCEPTANCE_MODULES_MERGED_SPLIT_SAAS): export BASE_CONFIG = $(CFG_SAAS) $(TEST_ACCEPTANCE_MODULES_MERGED_SPLIT_SAAS): export JUNIT_ROOT_SUITE_NAME = SaaS modules acceptance tests