For 1.19.0 build, Pull Ginkgo test cases from argocd-operator repo and integrate them into gitops-operator test structure

go.mod

@@ -4,6 +4,7 @@ go 1.24.6
 
 require (
 	github.com/argoproj-labs/argo-rollouts-manager v0.0.7-0.20251105123110-0c547c7a7765
+	github.com/argoproj-labs/argocd-image-updater v1.0.1
 	github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20251203145554-258914335b86
 	github.com/argoproj/argo-cd/v3 v3.1.9
 	github.com/argoproj/gitops-engine v0.7.1-0.20250905160054-e48120133eec

go.sum

@@ -31,6 +31,8 @@ github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be h1:9AeTilPcZAjCFI
 github.com/anmitsu/go-shlex v0.0.0-20200514113438-38f4b401e2be/go.mod h1:ySMOLuWl6zY27l47sB3qLNK6tF2fkHG55UZxx8oIVo4=
 github.com/argoproj-labs/argo-rollouts-manager v0.0.7-0.20251105123110-0c547c7a7765 h1:zVN+W/nQrRB/kB63YcvcCseuiE//sEzNw6Oa8rqiFOs=
 github.com/argoproj-labs/argo-rollouts-manager v0.0.7-0.20251105123110-0c547c7a7765/go.mod h1:WPyZkNHZjir/OTt8mrRwcUZKe1euHrHPJsRv1Wp/F/0=
+github.com/argoproj-labs/argocd-image-updater v1.0.1 h1:g6WRF33TQ0/CPDndbC97oP0aEqJMEesQenz0Cz8F6XQ=
+github.com/argoproj-labs/argocd-image-updater v1.0.1/go.mod h1:PJ+Pb3faVqSzNNs35INUZYtzlaqKvBE2ZgZGdDabJQM=
 github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20251203145554-258914335b86 h1:crfiDUoEdB1wDUZCpo6Q4rQZmEoFqsrS5swvckM3OUw=
 github.com/argoproj-labs/argocd-operator v0.17.0-rc1.0.20251203145554-258914335b86/go.mod h1:JUvpFGuOdBL23437e/IdBsdwUE+69J6LzKQ2Q42ycc0=
 github.com/argoproj/argo-cd/v3 v3.1.9 h1:9P9vJKo1RGWu6mtQnGu61r+0h3XKlA2j3kVhwogUQ/0=

test/openshift/e2e/ginkgo/fixture/clusterserviceversion/fixture.go

@@ -6,13 +6,20 @@ import (
 	//lint:ignore ST1001 "This is a common practice in Gomega tests for readability."
 	. "github.com/onsi/gomega" //nolint:all
 	olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
+	"github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture"
 	"github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils"
 	"k8s.io/client-go/util/retry"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
 // Update will update a ClusterServiceVersion CR. Update will keep trying to update object until it succeeds, or times out.
 func Update(obj *olmv1alpha1.ClusterServiceVersion, modify func(*olmv1alpha1.ClusterServiceVersion)) {
+	if fixture.EnvNonOLM() || fixture.EnvLocalRun() || fixture.EnvCI() {
+		// Skipping CSV update as operator is not managed via OLM in these environments.
+		// In CI environment, the operator is managed via Subscription rather than direct CSV access.
+		return
+	}
+
 	k8sClient, _ := utils.GetE2ETestKubeClient()
 
 	err := retry.RetryOnConflict(retry.DefaultRetry, func() error {

test/openshift/e2e/ginkgo/fixture/fixture.go

@@ -205,8 +205,9 @@ func EnsureSequentialCleanSlateWithError() error {
 // RemoveDynamicPluginFromCSV ensures that if the CSV in 'openshift-gitops-operator' NS exists, that the CSV does not contain the dynamic plugin env var
 func RemoveDynamicPluginFromCSV(ctx context.Context, k8sClient client.Client) error {
 
-	if EnvNonOLM() || EnvLocalRun() {
-		// Skipping as CSV does exist when not using OLM, nor does it exist when running locally
+	if EnvNonOLM() || EnvLocalRun() || EnvCI() {
+		// Skipping as CSV does not exist when not using OLM, nor when running locally.
+		// In CI environment, the operator is managed via Subscription rather than direct CSV access.
 		return nil
 	}
 

test/openshift/e2e/ginkgo/fixture/utils/fixtureUtils.go

@@ -8,19 +8,12 @@ import (
 	"k8s.io/client-go/tools/clientcmd"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 
-	argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 	argocdv1alpha1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
-
 	osappsv1 "github.com/openshift/api/apps/v1"
-	olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
-
-	rolloutmanagerv1alpha1 "github.com/argoproj-labs/argo-rollouts-manager/api/v1alpha1"
-	argov1alpha1api "github.com/argoproj-labs/argocd-operator/api/v1alpha1"
 	consolev1 "github.com/openshift/api/console/v1"
 	routev1 "github.com/openshift/api/route/v1"
 	securityv1 "github.com/openshift/api/security/v1"
 	monitoringv1 "github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring/v1"
-	gitopsoperatorv1alpha1 "github.com/redhat-developer/gitops-operator/api/v1alpha1"
 	admissionv1 "k8s.io/api/admissionregistration/v1"
 	apps "k8s.io/api/apps/v1"
 	autoscalingv2 "k8s.io/api/autoscaling/v2"
@@ -30,6 +23,14 @@ import (
 	rbacv1 "k8s.io/api/rbac/v1"
 	crdv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 
+	rolloutmanagerv1alpha1 "github.com/argoproj-labs/argo-rollouts-manager/api/v1alpha1"
+	imageUpdater "github.com/argoproj-labs/argocd-image-updater/api/v1alpha1"
+	olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
+	gitopsoperatorv1alpha1 "github.com/redhat-developer/gitops-operator/api/v1alpha1"
+
+	argov1alpha1api "github.com/argoproj-labs/argocd-operator/api/v1alpha1"
+	argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1"
+
 	//lint:ignore ST1001 "This is a common practice in Gomega tests for readability."
 	. "github.com/onsi/gomega" //nolint:all
 )
@@ -94,14 +95,6 @@ func getKubeClient(config *rest.Config) (client.Client, *runtime.Scheme, error)
 		return nil, nil, err
 	}
 
-	if err := gitopsoperatorv1alpha1.AddToScheme(scheme); err != nil {
-		return nil, nil, err
-	}
-
-	if err := olmv1alpha1.AddToScheme(scheme); err != nil {
-		return nil, nil, err
-	}
-
 	if err := routev1.AddToScheme(scheme); err != nil {
 		return nil, nil, err
 	}
@@ -113,9 +106,6 @@ func getKubeClient(config *rest.Config) (client.Client, *runtime.Scheme, error)
 	if err := consolev1.AddToScheme(scheme); err != nil {
 		return nil, nil, err
 	}
-	if err := rolloutmanagerv1alpha1.AddToScheme(scheme); err != nil {
-		return nil, nil, err
-	}
 
 	if err := argov1alpha1api.AddToScheme(scheme); err != nil {
 		return nil, nil, err
@@ -137,6 +127,21 @@ func getKubeClient(config *rest.Config) (client.Client, *runtime.Scheme, error)
 		return nil, nil, err
 	}
 
+	if err := imageUpdater.AddToScheme(scheme); err != nil {
+		return nil, nil, err
+	}
+
+	if err := olmv1alpha1.AddToScheme(scheme); err != nil {
+		return nil, nil, err
+	}
+
+	if err := gitopsoperatorv1alpha1.AddToScheme(scheme); err != nil {
+		return nil, nil, err
+	}
+
+	if err := rolloutmanagerv1alpha1.AddToScheme(scheme); err != nil {
+		return nil, nil, err
+	}
 	k8sClient, err := client.New(config, client.Options{Scheme: scheme})
 	if err != nil {
 		return nil, nil, err

test/openshift/e2e/ginkgo/parallel/1-042_restricted_pss_compliant_test.go

@@ -20,19 +20,20 @@ import (
 	"context"
 	"strings"
 
-	argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1"
 	"github.com/google/uuid"
 	. "github.com/onsi/ginkgo/v2"
 	. "github.com/onsi/gomega"
-	"github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture"
-	argocdFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/argocd"
-	k8sFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/k8s"
-	fixtureUtils "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils"
 	appsv1 "k8s.io/api/apps/v1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/utils/ptr"
 
+	argov1beta1api "github.com/argoproj-labs/argocd-operator/api/v1beta1"
+	"github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture"
+	argocdFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/argocd"
+	k8sFixture "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/k8s"
+	fixtureUtils "github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils"
+
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )