|
56 | 56 | dev.static dev.static.lms dev.static.studio dev.stats dev.status \ |
57 | 57 | dev.stop dev.up dev.up.attach dev.up.shell \ |
58 | 58 | dev.up.without-deps dev.up.without-deps.shell dev.up.with-programs \ |
59 | | - dev.up.with-watchers dev.validate docs e2e-tests e2e-tests.with-shell \ |
| 59 | + dev.up.with-watchers dev.validate docs \ |
60 | 60 | help requirements impl-dev.clone.https impl-dev.clone.ssh impl-dev.provision \ |
61 | 61 | impl-dev.pull impl-dev.pull.without-deps impl-dev.up impl-dev.up.attach \ |
62 | 62 | impl-dev.up.without-deps selfcheck upgrade \ |
@@ -212,12 +212,8 @@ impl-dev.pull.%: ## Pull latest Docker images for services and their dependencie |
212 | 212 | ######################################################################################## |
213 | 213 |
|
214 | 214 | impl-dev.provision: ## Provision dev environment with default services, and then stop them. |
215 | | - # We provision all default services as well as 'e2e' (end-to-end tests). |
216 | | - # e2e is not part of `DEFAULT_SERVICES` because it isn't a service; |
217 | | - # it's just a way to tell ./provision.sh that the fake data for end-to-end |
218 | | - # tests should be prepared. |
219 | 215 | make dev.check-memory |
220 | | - $(WINPTY) bash ./provision.sh $(DEFAULT_SERVICES)+e2e |
| 216 | + $(WINPTY) bash ./provision.sh $(DEFAULT_SERVICES) |
221 | 217 | make dev.stop |
222 | 218 |
|
223 | 219 | dev.provision: ## Provision dev environment with default services, and then stop them. |
@@ -604,12 +600,6 @@ metrics-opt-out: ## To opt out of metrics data collection |
604 | 600 | docs: ## generate Sphinx HTML documentation, including API docs |
605 | 601 | tox -e docs |
606 | 602 |
|
607 | | -e2e-tests: dev.up.lms+studio+firefox+chrome ## Run the end-to-end tests against the service containers. |
608 | | - docker run -t --network=$(COMPOSE_PROJECT_NAME)_default -v $(DEVSTACK_WORKSPACE)/edx-e2e-tests:/edx-e2e-tests --env-file $(DEVSTACK_WORKSPACE)/edx-e2e-tests/devstack_env edxops/e2e env TERM=$(TERM) bash -c 'paver e2e_test' |
609 | | - |
610 | | -e2e-tests.with-shell: dev.up.lms+studio+firefox+chrome ## Start the end-to-end tests container with a shell. |
611 | | - docker run -it --network=$(COMPOSE_PROJECT_NAME)_default -v $(DEVSTACK_WORKSPACE)/edx-e2e-tests:/edx-e2e-tests --env-file $(DEVSTACK_WORKSPACE)/edx-e2e-tests/devstack_env edxops/e2e env TERM=$(TERM) bash |
612 | | - |
613 | 603 | validate-lms-volume: ## Validate that changes to the local workspace are reflected in the LMS container. |
614 | 604 | touch $(DEVSTACK_WORKSPACE)/edx-platform/testfile |
615 | 605 | docker-compose exec -T lms ls /edx/app/edxapp/edx-platform/testfile |
|
0 commit comments