Merge remote-tracking branch 'origin/release-v2-dev' into chore/condition-assertion

# Conflicts:
#	test/e2e/framework/assertion.go

Author: dspo

Makefile

@@ -13,7 +13,7 @@ KIND_NAME ?= apisix-ingress-cluster
 GATEAY_API_VERSION ?= v1.2.0
 
 DASHBOARD_VERSION ?= dev
-TEST_TIMEOUT ?= 45m
+TEST_TIMEOUT ?= 60m
 
 # CRD Reference Documentation
 CRD_REF_DOCS_VERSION ?= v0.1.0

test/e2e/gatewayapi/httproute.go

@@ -1007,12 +1007,13 @@ spec:
 			)
 
 			By("access dataplane to check the HTTPRoutePolicy")
-			s.NewAPISIXClient().
-				GET("/get").
-				WithHost("httpbin.example").
-				WithHeader("X-Route-Name", "httpbin").
-				Expect().
-				Status(http.StatusNotFound)
+			Eventually(func() int {
+				return s.NewAPISIXClient().
+					GET("/get").
+					WithHost("httpbin.example").
+					WithHeader("X-Route-Name", "httpbin").
+					Expect().Raw().StatusCode
+			}).WithTimeout(8 * time.Second).ProbeEvery(time.Second).Should(Equal(http.StatusNotFound))
 
 			s.NewAPISIXClient().
 				GET("/get").