feat(tests): update patch type and improve test execution consistency

Signed-off-by: l1b0k <[email protected]>

Author: l1b0k

Makefile

@@ -67,15 +67,15 @@ datapath-test: ## Run datapath tests using the Makefile in tests/kind directory.
 
 .PHONY: e2e-test
 e2e-test: ## Run e2e functional tests (excludes upgrade tests).
-	go test -v -timeout 60m -tags e2e ./tests -run 'Test[^U].*' $(TESTARGS)
+	go test -v -count=1 -timeout 60m -tags e2e ./tests -run 'Test[^U].*' $(TESTARGS)
 
 .PHONY: e2e-upgrade-test
 e2e-upgrade-test: ## Run e2e upgrade tests only.
-	go test -v -timeout 60m -tags e2e ./tests -run 'TestUpgrade' $(TESTARGS)
+	go test -v -count=1 -timeout 60m -tags e2e ./tests -run 'TestUpgrade' $(TESTARGS)
 
 .PHONY: e2e-test-all
 e2e-test-all: ## Run all e2e tests (functional + upgrade).
-	go test -v -timeout 60m -tags e2e ./tests $(TESTARGS)
+	go test -v -count=1 -timeout 60m -tags e2e ./tests $(TESTARGS)
 
 ##@ Build
 

tests/idle_ip_reclaim_test.go

@@ -612,5 +612,5 @@ func triggerNode(ctx context.Context, config *envconf.Config, t *testing.T, node
 			},
 		},
 	})
-	return config.Client().Resources().Patch(ctx, node, k8s.Patch{PatchType: types.StrategicMergePatchType, Data: mergePatch})
+	return config.Client().Resources().Patch(ctx, node, k8s.Patch{PatchType: types.MergePatchType, Data: mergePatch})
 }