From cbe7a2f5a9b422a2b175dcfa9bd7f9d8618ac0ed Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Fri, 12 Jul 2024 11:46:33 +0200 Subject: [PATCH] Merge pull request #19282 from overleaf/jpa-filestore-sharding [filestore] add sharding to test_acceptance in CI GitOrigin-RevId: dd16a0370878d76a934d277838083e08ae0ad8c2 --- services/chat/Makefile | 6 ++-- services/chat/docker-compose.ci.yml | 2 +- services/clsi/Makefile | 6 ++-- services/clsi/docker-compose.ci.yml | 2 +- services/contacts/Makefile | 6 ++-- services/contacts/docker-compose.ci.yml | 2 +- services/docstore/Makefile | 6 ++-- services/docstore/docker-compose.ci.yml | 2 +- services/document-updater/Makefile | 6 ++-- .../document-updater/docker-compose.ci.yml | 2 +- services/filestore/Makefile | 6 ++-- services/filestore/buildscript.txt | 1 + services/filestore/docker-compose.ci.yml | 2 +- .../test/acceptance/js/TestConfig.js | 34 ++++++++++++++----- services/history-v1/Makefile | 6 ++-- services/history-v1/docker-compose.ci.yml | 2 +- services/notifications/Makefile | 6 ++-- services/notifications/docker-compose.ci.yml | 2 +- services/project-history/Makefile | 6 ++-- .../project-history/docker-compose.ci.yml | 2 +- services/real-time/Makefile | 6 ++-- services/real-time/docker-compose.ci.yml | 2 +- services/spelling/Makefile | 6 ++-- services/spelling/docker-compose.ci.yml | 2 +- 24 files changed, 82 insertions(+), 41 deletions(-) diff --git a/services/chat/Makefile b/services/chat/Makefile index 958d3d2426..3c226aba6d 100644 --- a/services/chat/Makefile +++ b/services/chat/Makefile @@ -14,11 +14,13 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \ MOCHA_GREP=${MOCHA_GREP} \ docker compose ${DOCKER_COMPOSE_FLAGS} +COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE ?= test_acceptance_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_ACCEPTANCE = \ - COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE) $(DOCKER_COMPOSE) +COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ - COMPOSE_PROJECT_NAME=test_unit_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) diff --git a/services/chat/docker-compose.ci.yml b/services/chat/docker-compose.ci.yml index 847c04364b..6f1a608534 100644 --- a/services/chat/docker-compose.ci.yml +++ b/services/chat/docker-compose.ci.yml @@ -28,7 +28,7 @@ services: mongo: condition: service_healthy user: node - command: npm run test:acceptance:_run + command: npm run test:acceptance tar: diff --git a/services/clsi/Makefile b/services/clsi/Makefile index 95cab44bf1..c2c4fb7017 100644 --- a/services/clsi/Makefile +++ b/services/clsi/Makefile @@ -14,11 +14,13 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \ MOCHA_GREP=${MOCHA_GREP} \ docker compose ${DOCKER_COMPOSE_FLAGS} +COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE ?= test_acceptance_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_ACCEPTANCE = \ - COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE) $(DOCKER_COMPOSE) +COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ - COMPOSE_PROJECT_NAME=test_unit_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) diff --git a/services/clsi/docker-compose.ci.yml b/services/clsi/docker-compose.ci.yml index d0478479ce..88b5315665 100644 --- a/services/clsi/docker-compose.ci.yml +++ b/services/clsi/docker-compose.ci.yml @@ -29,7 +29,7 @@ services: TEXLIVE_IMAGE: ENABLE_PDF_CACHING: "true" PDF_CACHING_ENABLE_WORKER_POOL: "true" - command: npm run test:acceptance:_run + command: npm run test:acceptance tar: diff --git a/services/contacts/Makefile b/services/contacts/Makefile index a8d8b9eafa..da64fc937b 100644 --- a/services/contacts/Makefile +++ b/services/contacts/Makefile @@ -14,11 +14,13 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \ MOCHA_GREP=${MOCHA_GREP} \ docker compose ${DOCKER_COMPOSE_FLAGS} +COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE ?= test_acceptance_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_ACCEPTANCE = \ - COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE) $(DOCKER_COMPOSE) +COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ - COMPOSE_PROJECT_NAME=test_unit_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) diff --git a/services/contacts/docker-compose.ci.yml b/services/contacts/docker-compose.ci.yml index 847c04364b..6f1a608534 100644 --- a/services/contacts/docker-compose.ci.yml +++ b/services/contacts/docker-compose.ci.yml @@ -28,7 +28,7 @@ services: mongo: condition: service_healthy user: node - command: npm run test:acceptance:_run + command: npm run test:acceptance tar: diff --git a/services/docstore/Makefile b/services/docstore/Makefile index 1a33801fe7..a7e62bbca4 100644 --- a/services/docstore/Makefile +++ b/services/docstore/Makefile @@ -14,11 +14,13 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \ MOCHA_GREP=${MOCHA_GREP} \ docker compose ${DOCKER_COMPOSE_FLAGS} +COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE ?= test_acceptance_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_ACCEPTANCE = \ - COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE) $(DOCKER_COMPOSE) +COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ - COMPOSE_PROJECT_NAME=test_unit_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) diff --git a/services/docstore/docker-compose.ci.yml b/services/docstore/docker-compose.ci.yml index 98aeeb05fb..3ed716fbd7 100644 --- a/services/docstore/docker-compose.ci.yml +++ b/services/docstore/docker-compose.ci.yml @@ -36,7 +36,7 @@ services: gcs: condition: service_healthy user: node - command: npm run test:acceptance:_run + command: npm run test:acceptance tar: diff --git a/services/document-updater/Makefile b/services/document-updater/Makefile index 2cea086b74..f1fd635653 100644 --- a/services/document-updater/Makefile +++ b/services/document-updater/Makefile @@ -14,11 +14,13 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \ MOCHA_GREP=${MOCHA_GREP} \ docker compose ${DOCKER_COMPOSE_FLAGS} +COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE ?= test_acceptance_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_ACCEPTANCE = \ - COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE) $(DOCKER_COMPOSE) +COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ - COMPOSE_PROJECT_NAME=test_unit_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) diff --git a/services/document-updater/docker-compose.ci.yml b/services/document-updater/docker-compose.ci.yml index 3ac06fb396..332a9710ca 100644 --- a/services/document-updater/docker-compose.ci.yml +++ b/services/document-updater/docker-compose.ci.yml @@ -33,7 +33,7 @@ services: redis: condition: service_healthy user: node - command: npm run test:acceptance:_run + command: npm run test:acceptance tar: diff --git a/services/filestore/Makefile b/services/filestore/Makefile index 759b9ee249..a19cf67af4 100644 --- a/services/filestore/Makefile +++ b/services/filestore/Makefile @@ -14,11 +14,13 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \ MOCHA_GREP=${MOCHA_GREP} \ docker compose ${DOCKER_COMPOSE_FLAGS} +COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE ?= test_acceptance_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_ACCEPTANCE = \ - COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE) $(DOCKER_COMPOSE) +COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ - COMPOSE_PROJECT_NAME=test_unit_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) diff --git a/services/filestore/buildscript.txt b/services/filestore/buildscript.txt index 2ff73ea60b..694badea11 100644 --- a/services/filestore/buildscript.txt +++ b/services/filestore/buildscript.txt @@ -8,3 +8,4 @@ filestore --node-version=18.20.2 --public-repo=True --script-version=4.5.0 +--test-acceptance-shards=SHARD_01_,SHARD_02_,SHARD_03_ diff --git a/services/filestore/docker-compose.ci.yml b/services/filestore/docker-compose.ci.yml index 979b334fad..01d13e08c5 100644 --- a/services/filestore/docker-compose.ci.yml +++ b/services/filestore/docker-compose.ci.yml @@ -45,7 +45,7 @@ services: gcs: condition: service_healthy user: node - command: npm run test:acceptance:_run + command: npm run test:acceptance tar: diff --git a/services/filestore/test/acceptance/js/TestConfig.js b/services/filestore/test/acceptance/js/TestConfig.js index d8c6d30a94..9cb1948722 100644 --- a/services/filestore/test/acceptance/js/TestConfig.js +++ b/services/filestore/test/acceptance/js/TestConfig.js @@ -1,3 +1,4 @@ +const fs = require('fs') const Path = require('path') // use functions to get a fresh copy, not a reference, each time @@ -64,26 +65,26 @@ function fallbackStores(primaryConfig, fallbackConfig) { } module.exports = { - FSPersistor: { + SHARD_01_FSPersistor: { backend: 'fs', stores: fsStores(), }, - S3Persistor: { + SHARD_01_S3Persistor: { backend: 's3', s3: s3Config(), stores: s3Stores(), }, - S3PersistorDefaultProviderCredentials: { + SHARD_01_S3PersistorDefaultProviderCredentials: { backend: 's3', s3: s3ConfigDefaultProviderCredentials(), stores: s3Stores(), }, - GcsPersistor: { + SHARD_01_GcsPersistor: { backend: 'gcs', gcs: gcsConfig(), stores: gcsStores(), }, - FallbackS3ToFSPersistor: { + SHARD_02_FallbackS3ToFSPersistor: { backend: 's3', s3: s3Config(), stores: s3Stores(), @@ -92,7 +93,7 @@ module.exports = { buckets: fallbackStores(s3Stores(), fsStores()), }, }, - FallbackFSToS3Persistor: { + SHARD_02_FallbackFSToS3Persistor: { backend: 'fs', s3: s3Config(), stores: fsStores(), @@ -101,7 +102,7 @@ module.exports = { buckets: fallbackStores(fsStores(), s3Stores()), }, }, - FallbackGcsToS3Persistor: { + SHARD_03_FallbackGcsToS3Persistor: { backend: 'gcs', gcs: gcsConfig(), stores: gcsStores(), @@ -111,7 +112,7 @@ module.exports = { buckets: fallbackStores(gcsStores(), s3Stores()), }, }, - FallbackS3ToGcsPersistor: { + SHARD_03_FallbackS3ToGcsPersistor: { backend: 's3', // can use the same bucket names for gcs and s3 (in tests) stores: s3Stores(), @@ -123,3 +124,20 @@ module.exports = { }, }, } + +function checkForUnexpectedTestFile() { + const awareOfSharding = [ + 'FilestoreApp.js', + 'FilestoreTests.js', + 'TestConfig.js', + 'TestHelper.js', + ] + for (const file of fs.readdirSync(__dirname).sort()) { + if (!awareOfSharding.includes(file)) { + throw new Error( + `Found new test file ${file}: All tests must be aware of the SHARD_ prefix.` + ) + } + } +} +checkForUnexpectedTestFile() diff --git a/services/history-v1/Makefile b/services/history-v1/Makefile index 62335fe17f..8760e1f481 100644 --- a/services/history-v1/Makefile +++ b/services/history-v1/Makefile @@ -14,11 +14,13 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \ MOCHA_GREP=${MOCHA_GREP} \ docker compose ${DOCKER_COMPOSE_FLAGS} +COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE ?= test_acceptance_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_ACCEPTANCE = \ - COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE) $(DOCKER_COMPOSE) +COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ - COMPOSE_PROJECT_NAME=test_unit_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) diff --git a/services/history-v1/docker-compose.ci.yml b/services/history-v1/docker-compose.ci.yml index 92dc83ba5e..4de133e440 100644 --- a/services/history-v1/docker-compose.ci.yml +++ b/services/history-v1/docker-compose.ci.yml @@ -35,7 +35,7 @@ services: gcs: condition: service_healthy user: node - command: npm run test:acceptance:_run + command: npm run test:acceptance tar: diff --git a/services/notifications/Makefile b/services/notifications/Makefile index cea323e057..afd7d6991a 100644 --- a/services/notifications/Makefile +++ b/services/notifications/Makefile @@ -14,11 +14,13 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \ MOCHA_GREP=${MOCHA_GREP} \ docker compose ${DOCKER_COMPOSE_FLAGS} +COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE ?= test_acceptance_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_ACCEPTANCE = \ - COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE) $(DOCKER_COMPOSE) +COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ - COMPOSE_PROJECT_NAME=test_unit_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) diff --git a/services/notifications/docker-compose.ci.yml b/services/notifications/docker-compose.ci.yml index 847c04364b..6f1a608534 100644 --- a/services/notifications/docker-compose.ci.yml +++ b/services/notifications/docker-compose.ci.yml @@ -28,7 +28,7 @@ services: mongo: condition: service_healthy user: node - command: npm run test:acceptance:_run + command: npm run test:acceptance tar: diff --git a/services/project-history/Makefile b/services/project-history/Makefile index 1013522b4f..935b8500ed 100644 --- a/services/project-history/Makefile +++ b/services/project-history/Makefile @@ -14,11 +14,13 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \ MOCHA_GREP=${MOCHA_GREP} \ docker compose ${DOCKER_COMPOSE_FLAGS} +COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE ?= test_acceptance_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_ACCEPTANCE = \ - COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE) $(DOCKER_COMPOSE) +COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ - COMPOSE_PROJECT_NAME=test_unit_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) diff --git a/services/project-history/docker-compose.ci.yml b/services/project-history/docker-compose.ci.yml index 3ac06fb396..332a9710ca 100644 --- a/services/project-history/docker-compose.ci.yml +++ b/services/project-history/docker-compose.ci.yml @@ -33,7 +33,7 @@ services: redis: condition: service_healthy user: node - command: npm run test:acceptance:_run + command: npm run test:acceptance tar: diff --git a/services/real-time/Makefile b/services/real-time/Makefile index 63fa32138c..c459d04f58 100644 --- a/services/real-time/Makefile +++ b/services/real-time/Makefile @@ -14,11 +14,13 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \ MOCHA_GREP=${MOCHA_GREP} \ docker compose ${DOCKER_COMPOSE_FLAGS} +COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE ?= test_acceptance_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_ACCEPTANCE = \ - COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE) $(DOCKER_COMPOSE) +COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ - COMPOSE_PROJECT_NAME=test_unit_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) diff --git a/services/real-time/docker-compose.ci.yml b/services/real-time/docker-compose.ci.yml index e2bdcaf6e2..ca9813adad 100644 --- a/services/real-time/docker-compose.ci.yml +++ b/services/real-time/docker-compose.ci.yml @@ -31,7 +31,7 @@ services: redis: condition: service_healthy user: node - command: npm run test:acceptance:_run + command: npm run test:acceptance tar: diff --git a/services/spelling/Makefile b/services/spelling/Makefile index 3f7389cb36..db5d3cf0f8 100644 --- a/services/spelling/Makefile +++ b/services/spelling/Makefile @@ -14,11 +14,13 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \ MOCHA_GREP=${MOCHA_GREP} \ docker compose ${DOCKER_COMPOSE_FLAGS} +COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE ?= test_acceptance_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_ACCEPTANCE = \ - COMPOSE_PROJECT_NAME=test_acceptance_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_ACCEPTANCE) $(DOCKER_COMPOSE) +COMPOSE_PROJECT_NAME_TEST_UNIT ?= test_unit_$(BUILD_DIR_NAME) DOCKER_COMPOSE_TEST_UNIT = \ - COMPOSE_PROJECT_NAME=test_unit_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) + COMPOSE_PROJECT_NAME=$(COMPOSE_PROJECT_NAME_TEST_UNIT) $(DOCKER_COMPOSE) clean: -docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) diff --git a/services/spelling/docker-compose.ci.yml b/services/spelling/docker-compose.ci.yml index 65a22e2927..bd3b37f86c 100644 --- a/services/spelling/docker-compose.ci.yml +++ b/services/spelling/docker-compose.ci.yml @@ -25,7 +25,7 @@ services: NODE_ENV: test NODE_OPTIONS: "--unhandled-rejections=strict" user: node - command: npm run test:acceptance:_run + command: npm run test:acceptance tar: