Skip to content

Commit 955af30

Browse files
authored
Move check for plus usage endpoint to test-with-plus target (#2902) (#2904) (#2908)
Problem: Functional tests for OSS on forks are failing because the PLUS_USAGE_ENDPOINT isn't set. Solution: Move check for PLUS_USAGE_ENDPOINT to the test-with-plus target.
1 parent 9c2deea commit 955af30

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

tests/Makefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,7 @@ stop-longevity-test: nfr-test ## Stop the longevity test and collects results
133133
--plus-license-file-name=$(PLUS_LICENSE_FILE) --plus-usage-endpoint=$(PLUS_USAGE_ENDPOINT)
134134

135135
.PHONY: test
136-
test: check-for-plus-usage-endpoint build-crossplane-image ## Runs the functional tests on your kind k8s cluster
136+
test: build-crossplane-image ## Runs the functional tests on your kind k8s cluster
137137
kind load docker-image nginx-crossplane:latest --name $(CLUSTER_NAME)
138138
go run github.com/onsi/ginkgo/v2/ginkgo --randomize-all --randomize-suites --keep-going --fail-on-pending \
139139
--trace -r -v --buildvcs --force-newlines $(GITHUB_OUTPUT) \
@@ -147,7 +147,7 @@ test: check-for-plus-usage-endpoint build-crossplane-image ## Runs the functiona
147147

148148
.PHONY: test-with-plus
149149
test-with-plus: PLUS_ENABLED=true
150-
test-with-plus: test ## Runs the functional tests for NGF with NGINX Plus on your default k8s cluster
150+
test-with-plus: check-for-plus-usage-endpoint test ## Runs the functional tests for NGF with NGINX Plus on your default k8s cluster
151151

152152
.PHONY: cleanup-gcp
153153
cleanup-gcp: cleanup-router cleanup-vm delete-gke-cluster ## Cleanup all GCP resources

0 commit comments

Comments
 (0)