Skip to content

Commit f876b22

Browse files
bug(project): Clean up experimenter_test container before trying to create it (#13786)
Because: - we are creating the experimenter_test container in some situations and not always cleaning it up This commit: - ensures we clean it up before we create it. Fixes #13785
1 parent 2598eb6 commit f876b22

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

Makefile

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -165,20 +165,21 @@ kill: compose_stop compose_rm docker_prune ## Stop, remove, and prune container
165165
echo "All containers removed!"
166166

167167
lint: build_test ## Running linting on source code
168-
-docker rm experimenter_test;
168+
-docker rm experimenter_test
169169
$(COMPOSE_TEST_RUN) experimenter sh -c '$(WAIT_FOR_DB) (${PARALLEL} "$(PYTHON_CHECK_MIGRATIONS)" "$(CHECK_DOCS)" "$(RUFF_FORMAT_CHECK)" "$(RUFF_CHECK)" "$(DJLINT_CHECK)" "$(ESLINT_LEGACY)" "$(ESLINT_RESULTS)" "$(ESLINT_NIMBUS_UI)" "$(PYTHON_TYPECHECK)" "$(PYTHON_TEST)" "$(JS_TEST_LEGACY)" "$(JS_TEST_RESULTS)" "$(RESULTS_SCHEMA_CHECK)") ${COLOR_CHECK}'
170170

171171
check: lint
172172

173173
check_and_report: build_test ## Only to be used on CI
174+
-docker rm experimenter_test
174175
$(COMPOSE_TEST_RUN) experimenter sh -c '$(WAIT_FOR_DB) (${PARALLEL} "$(PYTHON_COVERAGE)") ${COLOR_CHECK}' || true
175176
docker cp experimenter_test:/experimenter/experimenter_coverage.json workspace/test-results
176177
docker cp experimenter_test:/experimenter/experimenter_tests.xml workspace/test-results
177178
cp workspace/test-results/experimenter_coverage.json $(UNIT_COVERAGE_JSON)
178179
cp workspace/test-results/experimenter_tests.xml $(UNIT_JUNIT_XML)
179180

180181
test: build_test ## Run tests
181-
-docker rm experimenter_test;
182+
-docker rm experimenter_test
182183
$(COMPOSE_TEST_RUN) experimenter sh -c '$(WAIT_FOR_DB) python manage.py test --parallel'
183184
pytest: test
184185

@@ -298,12 +299,13 @@ cirrus_down: cirrus_build
298299
$(CIRRUS_ENABLE) $(COMPOSE) down cirrus
299300

300301
cirrus_test: cirrus_build_test
302+
-docker rm experimenter_test
301303
$(CIRRUS_ENABLE) $(COMPOSE_TEST_RUN) cirrus sh -c '$(CIRRUS_PYTEST)'
302304

303305
cirrus_check: cirrus_lint
304-
docker rm experimenter_test
305306

306307
cirrus_lint: cirrus_build_test integration_clean
308+
-docker rm experimenter_test
307309
$(CIRRUS_ENABLE) $(COMPOSE_TEST_RUN) cirrus sh -c "$(CIRRUS_RUFF_CHECK) && $(CIRRUS_BLACK_CHECK) && $(CIRRUS_PYTHON_TYPECHECK) && $(CIRRUS_PYTEST) && $(CIRRUS_GENERATE_DOCS) --check"
308310

309311
cirrus_check_and_report: cirrus_lint

0 commit comments

Comments
 (0)