Skip to content

Commit

Permalink
Move check for plus usage endpoint to test-with-plus target (#2902) (#…
Browse files Browse the repository at this point in the history
…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.
  • Loading branch information
kate-osborn authored Dec 13, 2024
1 parent 9c2deea commit 955af30
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ stop-longevity-test: nfr-test ## Stop the longevity test and collects results
--plus-license-file-name=$(PLUS_LICENSE_FILE) --plus-usage-endpoint=$(PLUS_USAGE_ENDPOINT)

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

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

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

0 comments on commit 955af30

Please sign in to comment.