From 4983e760bbb569fc151e04db553f57685b4182d3 Mon Sep 17 00:00:00 2001 From: Jakob Ackermann Date: Tue, 11 Feb 2025 11:36:01 +0000 Subject: [PATCH] [web] use tmpfs for transferring /overleaf into cypress image (#23529) GitOrigin-RevId: e913a4388be6feb6e0cddd098f64452bfa0e7ef7 --- services/web/Dockerfile.frontend_ct | 9 --------- services/web/Makefile | 5 ++--- services/web/docker-compose.ci.yml | 10 ++-------- 3 files changed, 4 insertions(+), 20 deletions(-) delete mode 100644 services/web/Dockerfile.frontend_ct diff --git a/services/web/Dockerfile.frontend_ct b/services/web/Dockerfile.frontend_ct deleted file mode 100644 index 49fb58843c..0000000000 --- a/services/web/Dockerfile.frontend_ct +++ /dev/null @@ -1,9 +0,0 @@ -ARG PROJECT_NAME -ARG BRANCH_NAME -ARG BUILD_NUMBER -ARG CYPRESS_IMAGE - -FROM ci/$PROJECT_NAME:$BRANCH_NAME-$BUILD_NUMBER AS dev - -FROM $CYPRESS_IMAGE -COPY --from=dev /overleaf /overleaf diff --git a/services/web/Makefile b/services/web/Makefile index bc2401f391..232511ccb2 100644 --- a/services/web/Makefile +++ b/services/web/Makefile @@ -135,9 +135,8 @@ TEST_FRONTEND_CT_VARIANTS = \ test_frontend_ct_editor \ # Note: The below cypress targets are for CI only -build_test_frontend_ct: $(TEST_FRONTEND_CT_VARIANTS:=/build) -$(TEST_FRONTEND_CT_VARIANTS:=/build): %/build: - COMPOSE_PROJECT_NAME=$*_$(BUILD_DIR_NAME) $(DOCKER_COMPOSE) build test_frontend_ct +build_test_frontend_ct: + docker run --rm --volume /dev/shm:/dev/shm --user root $(IMAGE_CI) bash -ec 'tar -cC / overleaf | tar -xC /dev/shm' test_frontend_ct_core: export CYPRESS_RESULTS=./cypress/results/core test_frontend_ct_core: export CYPRESS_SPEC_PATTERN=./test/frontend/**/*.spec.{js,jsx,ts,tsx} diff --git a/services/web/docker-compose.ci.yml b/services/web/docker-compose.ci.yml index a8a9f4b5a1..6c5f5d861c 100644 --- a/services/web/docker-compose.ci.yml +++ b/services/web/docker-compose.ci.yml @@ -54,14 +54,7 @@ services: NODE_OPTIONS: "--unhandled-rejections=strict" test_frontend_ct: - build: - context: . - dockerfile: ./Dockerfile.frontend_ct - args: - PROJECT_NAME: $PROJECT_NAME - BRANCH_NAME: $BRANCH_NAME - BUILD_NUMBER: $BUILD_NUMBER - CYPRESS_IMAGE: $CYPRESS_IMAGE + image: $CYPRESS_IMAGE working_dir: /overleaf/services/web entrypoint: bash environment: @@ -69,6 +62,7 @@ services: CYPRESS_EXCLUDE_SPEC_PATTERN: ${CYPRESS_EXCLUDE_SPEC_PATTERN:-} volumes: - ${CYPRESS_RESULTS:-./cypress/results}:/overleaf/services/web/cypress/results/ + - /dev/shm/overleaf:/overleaf command: - "-c" - "if npm run cypress:run-ct; then exit 0; else mkdir -p ./cypress/results && touch ./cypress/results/.cypress_fail; fi;"