diff --git a/.github/workflows/e2e-testing.yml b/.github/workflows/e2e-testing.yml index 73b0600a2d..dbfa0763d5 100644 --- a/.github/workflows/e2e-testing.yml +++ b/.github/workflows/e2e-testing.yml @@ -18,5 +18,10 @@ jobs: - name: Build frontend run: yarn run build - - name: Run web service and E2E tests - run: docker compose -f docker-compose-e2e-tests.yml up --exit-code-from e2e-tests + - name: Run services and E2E tests + run: | + docker compose -f docker-compose-e2e-tests.yml up nginx web db --detach --wait + docker compose cp e2e_testing/fixtures/002_carousel.sql db:/002_carousel.sql + docker compose exec -u postgres db psql postgres postgres -f /002_carousel.sql + docker compose -f docker-compose-e2e-tests.yml run e2e-tests + docker compose down diff --git a/docker-compose.yml b/docker-compose.yml index 56ca4583c5..5dca39e9de 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -133,19 +133,6 @@ services: ports: - "9998:9998" - e2e-tests: - build: - context: e2e_testing - args: - - BASE_URL=http://web:8063 - environment: - - CI=true - depends_on: - nginx: - condition: service_healthy - links: - - nginx - volumes: opensearch-data1: django_media: