Merge pull request #29452 from pperiyasamy/fix-nmstate-failures

openshift-merge-bot[bot] · web-flow · commit 531214235b29 · 2025-01-24T11:51:23.000Z
SDN-4168: Fix for nmstate deployment related failures
diff --git a/test/extended/networking/util.go b/test/extended/networking/util.go
@@ -721,7 +721,7 @@ func deployNmstateHandler(oc *exutil.CLI) error {
 }
 
 func ensureNmstateHandlerRunning(oc *exutil.CLI) error {
-	err := wait.PollUntilContextTimeout(context.Background(), poll, 2*time.Minute, true,
+	err := wait.PollUntilContextTimeout(context.Background(), poll, 5*time.Minute, true,
 		func(ctx context.Context) (bool, error) {
 			// Ensure nmstate handler is running.
 			return isDaemonSetRunning(oc, nmstateNamespace, "nmstate-handler")
diff --git a/test/extended/util/managed_services.go b/test/extended/util/managed_services.go
@@ -35,6 +35,7 @@ var ManagedServiceNamespaces = sets.New[string](
 	"openshift-managed-upgrade-operator",
 	"openshift-marketplace",
 	"openshift-must-gather-operator",
+	"openshift-nmstate",
 	"openshift-observability-operator",
 	"openshift-ocm-agent-operator",
 	"openshift-operators-redhat",

Original file line number	Diff line number	Diff line change
`@@ -721,7 +721,7 @@ func deployNmstateHandler(oc *exutil.CLI) error {`
`721`	`721`	`}`
`722`	`722`
`723`	`723`	`func ensureNmstateHandlerRunning(oc *exutil.CLI) error {`
`724`		`- err := wait.PollUntilContextTimeout(context.Background(), poll, 2*time.Minute, true,`
	`724`	`+ err := wait.PollUntilContextTimeout(context.Background(), poll, 5*time.Minute, true,`
`725`	`725`	`func(ctx context.Context) (bool, error) {`
`726`	`726`	`// Ensure nmstate handler is running.`
`727`	`727`	`return isDaemonSetRunning(oc, nmstateNamespace, "nmstate-handler")`