This is an automated email from the ASF dual-hosted git repository.
adutra pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/polaris.git
The following commit(s) were added to refs/heads/main by this push:
new d1246120a Fix python CI client-integration-test (#2305)
d1246120a is described below
commit d1246120a70f1eab27ca8be2e5d0aa1651f7dd1c
Author: Christopher Lambert <xn...@gmx.de>
AuthorDate: Fri Aug 8 16:50:30 2025 +0200
Fix python CI client-integration-test (#2305)
`CONTAINER_TOOL` got renamed to `DOCKER` in
6764a886857da464e3de11013165cd82aa5fedcb
but then
eda70740a4e327889f1ac38295d23c8947d87703
added more `CONTAINER_TOOL` usage
---
Makefile | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index 5ca20c749..225b91249 100644
--- a/Makefile
+++ b/Makefile
@@ -147,10 +147,10 @@ client-unit-test: client-setup-env ## Run client unit
tests
client-integration-test: client-setup-env ## Run client integration tests
@echo "--- Starting client integration tests ---"
@echo "Ensuring Docker Compose services are stopped and removed..."
- @$(CONTAINER_TOOL) compose -f $(PYTHON_CLIENT_DIR)/docker-compose.yml
kill || true # `|| true` prevents make from failing if containers don't exist
- @$(CONTAINER_TOOL) compose -f $(PYTHON_CLIENT_DIR)/docker-compose.yml
rm -f || true # `|| true` prevents make from failing if containers don't exist
+ @$(DOCKER) compose -f $(PYTHON_CLIENT_DIR)/docker-compose.yml kill ||
true # `|| true` prevents make from failing if containers don't exist
+ @$(DOCKER) compose -f $(PYTHON_CLIENT_DIR)/docker-compose.yml rm -f ||
true # `|| true` prevents make from failing if containers don't exist
@echo "Bringing up Docker Compose services in detached mode..."
- @$(CONTAINER_TOOL) compose -f $(PYTHON_CLIENT_DIR)/docker-compose.yml
up -d
+ @$(DOCKER) compose -f $(PYTHON_CLIENT_DIR)/docker-compose.yml up -d
@echo "Waiting for Polaris HTTP health check to pass..."
@until curl -s -f http://localhost:8182/q/health > /dev/null; do \
echo "Still waiting for HTTP 200 from /q/health (sleeping
2s)..."; \
@@ -160,7 +160,7 @@ client-integration-test: client-setup-env ## Run client
integration tests
@$(ACTIVATE_AND_CD) && poetry run pytest integration_tests/
@echo "--- Client integration tests complete ---"
@echo "Tearing down Docker Compose services..."
- @$(CONTAINER_TOOL) compose -f $(PYTHON_CLIENT_DIR)/docker-compose.yml
down || true # Ensure teardown even if tests fail
+ @$(DOCKER) compose -f $(PYTHON_CLIENT_DIR)/docker-compose.yml down ||
true # Ensure teardown even if tests fail
.PHONY: client-cleanup
client-cleanup: ## Cleanup virtual environment and Python cache files
