Merge pull request #1694 from gianlucam76/continue-on-error

gianlucam76 · web-flow · commit 0b8188b7fb60 · 2026-04-06T08:11:42.000+02:00
(chore) Set continue on error and conflict on test
diff --git a/test/fv/helm_failure_message_test.go b/test/fv/helm_failure_message_test.go
@@ -68,6 +68,8 @@ var _ = Describe("Helm with conflicts", func() {
 		err := retry.RetryOnConflict(retry.DefaultRetry, func() error {
 			Expect(k8sClient.Get(context.TODO(),
 				types.NamespacedName{Name: clusterProfile.Name}, currentClusterProfile)).To(Succeed())
+			currentClusterProfile.Spec.ContinueOnError = true
+			currentClusterProfile.Spec.ContinueOnConflict = true
 			currentClusterProfile.Spec.HelmCharts = []configv1beta1.HelmChart{
 				{
 					RepositoryURL:    "oci://ghcr.io/k0rdent/catalog/charts",

Original file line number	Diff line number	Diff line change
`@@ -68,6 +68,8 @@ var _ = Describe("Helm with conflicts", func() {`
`68`	`68`	`err := retry.RetryOnConflict(retry.DefaultRetry, func() error {`
`69`	`69`	`Expect(k8sClient.Get(context.TODO(),`
`70`	`70`	`types.NamespacedName{Name: clusterProfile.Name}, currentClusterProfile)).To(Succeed())`
	`71`	`+ currentClusterProfile.Spec.ContinueOnError = true`
	`72`	`+ currentClusterProfile.Spec.ContinueOnConflict = true`
`71`	`73`	`currentClusterProfile.Spec.HelmCharts = []configv1beta1.HelmChart{`
`72`	`74`	`{`
`73`	`75`	`RepositoryURL: "oci://ghcr.io/k0rdent/catalog/charts",`