add graceful-recovery test to pipeline

Author: salonichf5

.github/workflows/functional.yml

@@ -119,7 +119,6 @@ jobs:
           ngf_tag=${{ steps.ngf-meta.outputs.version }}
           make test${{ inputs.image == 'plus' && '-with-plus' || ''}} PREFIX=${ngf_prefix} TAG=${ngf_tag} GINKGO_LABEL=telemetry
         working-directory: ./tests
-
       - name: Run functional tests
         run: |
           ngf_prefix=ghcr.io/nginxinc/nginx-gateway-fabric

tests/suite/graceful_recovery_test.go

@@ -28,7 +28,7 @@ const (
 
 // Since checkContainerLogsForErrors may experience interference from previous tests (as explained in the function
 // documentation), this test is recommended to be run separate from other nfr tests.
-var _ = Describe("Graceful Recovery test", Ordered, Label("nfr", "graceful-recovery"), func() {
+var _ = Describe("Graceful Recovery test", Ordered, Label("functional", "graceful-recovery"), func() {
 	files := []string{
 		"graceful-recovery/cafe.yaml",
 		"graceful-recovery/cafe-secret.yaml",
@@ -42,10 +42,10 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("nfr", "graceful-recov
 		},
 	}
 
-	teaURL := "https://cafe.example.com/tea"
-	coffeeURL := "http://cafe.example.com/coffee"
+	teaURI := "/tea"
+	coffeeURI := "http://cafe.example.com/coffee"
 
-	var ngfPodName string
+	var ngfPodName, teaURL, coffeeURL string
 
 	BeforeAll(func() {
 		// this test is unique in that it will check the entire log of both ngf and nginx containers
@@ -60,6 +60,12 @@ var _ = Describe("Graceful Recovery test", Ordered, Label("nfr", "graceful-recov
 		Expect(podNames).To(HaveLen(1))
 
 		ngfPodName = podNames[0]
+		port := 80
+		if portFwdPort != 0 {
+			port = portFwdPort
+		}
+		teaURL = fmt.Sprintf("http://cafe.example.com:%d", port) + teaURI
+		coffeeURL = fmt.Sprintf("http://cafe.example.com:%d", port) + coffeeURI
 	})
 
 	BeforeEach(func() {

tests/suite/system_suite_test.go

@@ -259,8 +259,8 @@ var _ = BeforeSuite(func() {
 		"upgrade",            // - running upgrade test (this test will deploy its own version)
 		"longevity-teardown", // - running longevity teardown (deployment will already exist)
 		"telemetry",          // - running telemetry test (NGF will be deployed as part of the test)
-		"graceful-recovery",  // - running graceful recovery test (this test will deploy its own version)
-		"scale",              // - running scale test (this test will deploy its own version)
+		// "graceful-recovery",  // - running graceful recovery test (this test will deploy its own version)
+		"scale", // - running scale test (this test will deploy its own version)
 	}
 	for _, s := range skipSubstrings {
 		if strings.Contains(labelFilter, s) {
@@ -299,6 +299,7 @@ func isNFR(labelFilter string) bool {
 		strings.Contains(labelFilter, "longevity") ||
 		strings.Contains(labelFilter, "performance") ||
 		strings.Contains(labelFilter, "upgrade") ||
-		strings.Contains(labelFilter, "graceful-recovery") ||
+		// graceful-recovery tests are treated as functional tests to be run in the pipeline
+		// strings.Contains(labelFilter, "graceful-recovery") ||
 		strings.Contains(labelFilter, "scale")
 }