From b99cc98744eb0d9fa49c1b5b90a05a3e5f97412b Mon Sep 17 00:00:00 2001
From: Kate Osborn <50597707+kate-osborn@users.noreply.github.com>
Date: Fri, 13 Dec 2024 10:36:41 -0700
Subject: [PATCH 1/2] Move check for plus usage endpoint to test-with-plus
 target (#2902)

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.
---
 tests/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile b/tests/Makefile
index e4f3431363..99547fc1a7 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -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) \
@@ -146,7 +146,7 @@ test: check-for-plus-usage-endpoint build-crossplane-image ## Runs the functiona
 		--plus-license-file-name=$(PLUS_LICENSE_FILE) --plus-usage-endpoint=$(PLUS_USAGE_ENDPOINT)
 
 .PHONY: test-with-plus
-test-with-plus: PLUS_ENABLED=true
+test-with-plus: check-for-plus-usage-endpoint PLUS_ENABLED=true
 test-with-plus: test ## Runs the functional tests for NGF with NGINX Plus on your default k8s cluster
 
 .PHONY: cleanup-gcp

From 160d35b4241a6583bec1ff8a13da2c4994e62a15 Mon Sep 17 00:00:00 2001
From: Kate Osborn <50597707+kate-osborn@users.noreply.github.com>
Date: Fri, 13 Dec 2024 11:46:08 -0700
Subject: [PATCH 2/2] Move check for plus usage endpoint to correct spot
 (#2904)

Problem: #2902 moved check-for-plus-usage-endpoint dependency to the wrong Makefile target which caused the pipelines on main to fail.

Solution: Move check-for-plus-usage-endpoint` dependency to the right target.
---
 tests/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/Makefile b/tests/Makefile
index 99547fc1a7..9f58422b00 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -146,8 +146,8 @@ test: build-crossplane-image ## Runs the functional tests on your kind k8s clust
 		--plus-license-file-name=$(PLUS_LICENSE_FILE) --plus-usage-endpoint=$(PLUS_USAGE_ENDPOINT)
 
 .PHONY: test-with-plus
-test-with-plus: check-for-plus-usage-endpoint PLUS_ENABLED=true
-test-with-plus: test ## Runs the functional tests for NGF with NGINX Plus on your default k8s cluster
+test-with-plus: PLUS_ENABLED=true
+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