From 0e2997a237f6836b63fbb1ffbb08dfcf3d37bdf1 Mon Sep 17 00:00:00 2001 From: June Kelly Date: Wed, 12 Jan 2022 09:53:32 +0000 Subject: [PATCH] Merge pull request #6323 from overleaf/jpa-web-remove-gnu-parallel [web] remove old way of running unit tests in parallel GitOrigin-RevId: 77ff350824f7e21a44dae3f233ee9eedcf07c389 --- services/web/Dockerfile | 4 ---- services/web/Makefile | 8 -------- services/web/package.json | 1 - 3 files changed, 13 deletions(-) diff --git a/services/web/Dockerfile b/services/web/Dockerfile index d15cb921bd..8320224c96 100644 --- a/services/web/Dockerfile +++ b/services/web/Dockerfile @@ -7,10 +7,6 @@ WORKDIR /overleaf/services/web # install_deps changes app files and installs npm packages # as such it has to run at a later stage -RUN apt-get update \ -&& apt-get install -y parallel \ -&& rm -rf /var/lib/apt/lists/* - RUN mkdir /overleaf/services/web/node_modules \ && chown node:node /overleaf/services/web/node_modules diff --git a/services/web/Makefile b/services/web/Makefile index 41ef34628a..ddcfb1538e 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -108,14 +108,6 @@ test_unit_app_parallel_gnu_make_docker: make test_unit_app_parallel_gnu_make --output-sync -j $(J) $(DOCKER_COMPOSE) down -v -t 0 -test_unit_app_parallel: test_unit_app_parallel_gnu_parallel -test_unit_app_parallel_gnu_parallel: export COMPOSE_PROJECT_NAME = \ - unit_test_parallel_$(BUILD_DIR_NAME) -test_unit_app_parallel_gnu_parallel: - $(DOCKER_COMPOSE) down -v -t 0 - $(DOCKER_COMPOSE) run --rm test_unit npm run test:unit:app:parallel - $(DOCKER_COMPOSE) down -v -t 0 - TEST_UNIT_MODULES = $(MODULE_DIRS:=/test_unit) $(TEST_UNIT_MODULES): %/test_unit: %/Makefile test_unit_modules: $(TEST_UNIT_MODULES) diff --git a/services/web/package.json b/services/web/package.json index 98ef2b1c55..66e832313b 100644 --- a/services/web/package.json +++ b/services/web/package.json @@ -18,7 +18,6 @@ "test:unit:all": "npm run test:unit:run_dir -- test/unit/src modules/*/test/unit/src", "test:unit:all:silent": "npm run test:unit:all -- --reporter dot", "test:unit:app": "npm run test:unit:run_dir -- test/unit/src", - "test:unit:app:parallel": "parallel --plain --keep-order --halt now,fail=1 npm run test:unit:run_dir -- {} ::: test/unit/src/*", "test:frontend": "NODE_ENV=test TZ=GMT mocha --recursive --timeout 5000 --exit --grep=$MOCHA_GREP --require test/frontend/bootstrap.js test/frontend modules/*/test/frontend", "test:frontend:coverage": "c8 --all --include 'frontend/js' --include 'modules/*/frontend/js' --exclude 'frontend/js/vendor' --reporter=lcov --reporter=text-summary npm run test:frontend", "test:karma": "karma start",