Skip to content

Removes Waits in Makefile #12820

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
danehans merged 1 commit into from
Nov 4, 2025
Merged

Removes Waits in Makefile #12820

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 0 additions & 18 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -629,21 +629,15 @@ CONFORMANCE_GATEWAY_CLASS ?= kgateway
CONFORMANCE_REPORT_ARGS ?= -report-output=$(TEST_ASSET_DIR)/conformance/$(VERSION)-report.yaml -organization=kgateway-dev -project=kgateway -version=$(VERSION) -url=github.com/kgateway-dev/kgateway -contact=github.com/kgateway-dev/kgateway/issues/new/choose
CONFORMANCE_ARGS := -gateway-class=$(CONFORMANCE_GATEWAY_CLASS) $(CONFORMANCE_SUPPORTED_FEATURES) $(CONFORMANCE_UNSUPPORTED_FEATURES) $(CONFORMANCE_SUPPORTED_PROFILES) $(CONFORMANCE_REPORT_ARGS)

# TODO [danehans]: Remove `kubectl wait` when gateway-api-inference-extension/issues/1315 is fixed.
.PHONY: conformance ## Run the conformance test suite
conformance: $(TEST_ASSET_DIR)/conformance/conformance_test.go ## Run the Gateway API conformance suite
go test -mod=mod -ldflags='$(LDFLAGS)' -tags conformance -test.v $(TEST_ASSET_DIR)/conformance/... -args $(CONFORMANCE_ARGS)
@echo "Waiting for gateway-conformance-infra namespace to terminate..."
kubectl wait ns gateway-conformance-infra --for=delete --timeout=2m || true

# Run only the specified conformance test. The name must correspond to the ShortName of one of the k8s gateway api
# conformance tests.
# TODO [danehans]: Remove `kubectl wait` when gateway-api-inference-extension/issues/1315 is fixed.
conformance-%: $(TEST_ASSET_DIR)/conformance/conformance_test.go ## Run only the specified Gateway API conformance test by ShortName
go test -mod=mod -ldflags='$(LDFLAGS)' -tags conformance -test.v $(TEST_ASSET_DIR)/conformance/... -args $(CONFORMANCE_ARGS) \
-run-test=$*
@echo "Waiting for gateway-conformance-infra namespace to terminate..."
kubectl wait ns gateway-conformance-infra --for=delete --timeout=2m || true

#----------------------------------------------------------------------------------
# Targets for running Gateway API Inference Extension conformance tests
Expand All @@ -665,7 +659,6 @@ GIE_CONFORMANCE_ARGS := \

INFERENCE_CONFORMANCE_DIR := $(shell go list -m -f '{{.Dir}}' sigs.k8s.io/gateway-api-inference-extension)/conformance

# TODO [danehans]: Remove `kubectl wait` when gateway-api-inference-extension/issues/1315 is fixed.
.PHONY: gie-conformance
gie-conformance: gie-crds ## Run the Gateway API Inference Extension conformance suite
@mkdir -p $(TEST_ASSET_DIR)/conformance
Expand All @@ -674,10 +667,7 @@ gie-conformance: gie-crds ## Run the Gateway API Inference Extension conformance
-timeout=25m \
-v $(INFERENCE_CONFORMANCE_DIR) \
-args $(GIE_CONFORMANCE_ARGS)
@echo "Waiting for gateway-conformance-infra namespace to terminate..."
kubectl wait ns gateway-conformance-infra --for=delete --timeout=2m || true

# TODO [danehans]: Remove `kubectl wait` when gateway-api-inference-extension/issues/1315 is fixed.
.PHONY: gie-conformance-%
gie-conformance-%: gie-crds ## Run only the specified Gateway API Inference Extension conformance test by ShortName
@mkdir -p $(TEST_ASSET_DIR)/conformance
Expand All @@ -686,8 +676,6 @@ gie-conformance-%: gie-crds ## Run only the specified Gateway API Inference Exte
-timeout=25m \
-v $(INFERENCE_CONFORMANCE_DIR) \
-args $(GIE_CONFORMANCE_ARGS) -run-test=$*
@echo "Waiting for gateway-conformance-infra namespace to terminate..."
kubectl wait ns gateway-conformance-infra --for=delete --timeout=2m || true

# An alias to run both Gateway API and Inference Extension conformance tests.
.PHONY: all-conformance
Expand All @@ -706,20 +694,14 @@ AGW_CONFORMANCE_GATEWAY_CLASS ?= agentgateway
AGW_CONFORMANCE_REPORT_ARGS ?= -report-output=$(TEST_ASSET_DIR)/conformance/agw-$(VERSION)-report.yaml -organization=kgateway-dev -project=kgateway -version=$(VERSION) -url=github.com/kgateway-dev/kgateway -contact=github.com/kgateway-dev/kgateway/issues/new/choose
AGW_CONFORMANCE_ARGS := -gateway-class=$(AGW_CONFORMANCE_GATEWAY_CLASS) $(AGW_CONFORMANCE_SUPPORTED_FEATURES) $(AGW_CONFORMANCE_UNSUPPORTED_FEATURES) $(AGW_CONFORMANCE_SUPPORTED_PROFILES) $(AGW_CONFORMANCE_REPORT_ARGS)

# TODO [danehans]: Remove `kubectl wait` when gateway-api-inference-extension/issues/1315 is fixed.
.PHONY: agw-conformance ## Run the agent gateway conformance test suite
agw-conformance: $(TEST_ASSET_DIR)/conformance/conformance_test.go
CONFORMANCE_GATEWAY_CLASS=$(AGW_CONFORMANCE_GATEWAY_CLASS) go test -mod=mod -ldflags='$(LDFLAGS)' -tags conformance -test.v $(TEST_ASSET_DIR)/conformance/... -args $(AGW_CONFORMANCE_ARGS)
@echo "Waiting for gateway-conformance-infra namespace to terminate..."
kubectl wait ns gateway-conformance-infra --for=delete --timeout=2m || true

# TODO [danehans]: Remove `kubectl wait` when gateway-api-inference-extension/issues/1315 is fixed.
# Run only the specified agent gateway conformance test
agw-conformance-%: $(TEST_ASSET_DIR)/conformance/conformance_test.go
CONFORMANCE_GATEWAY_CLASS=$(AGW_CONFORMANCE_GATEWAY_CLASS) go test -mod=mod -ldflags='$(LDFLAGS)' -tags conformance -test.v $(TEST_ASSET_DIR)/conformance/... -args $(AGW_CONFORMANCE_ARGS) \
-run-test=$*
@echo "Waiting for gateway-conformance-infra namespace to terminate..."
kubectl wait ns gateway-conformance-infra --for=delete --timeout=2m || true

#----------------------------------------------------------------------------------
# Dependency Bumping
Expand Down