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

Author: nas438

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,11 @@ import (
 	rbacv1 "k8s.io/api/rbac/v1"
 	crdv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 
+	imageUpdater "github.com/argoproj-labs/argocd-image-updater/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 +92,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 +103,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 +124,10 @@ 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
+	}
+
 	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/argoproj-labs/argocd-operator/tests/ginkgo/fixture"
+	argocdFixture "github.com/argoproj-labs/argocd-operator/tests/ginkgo/fixture/argocd"
+	k8sFixture "github.com/argoproj-labs/argocd-operator/tests/ginkgo/fixture/k8s"
+	fixtureUtils "github.com/argoproj-labs/argocd-operator/tests/ginkgo/fixture/utils"
+
 	"sigs.k8s.io/controller-runtime/pkg/client"
 )
 
@@ -58,6 +59,7 @@ var _ = Describe("GitOps Operator Parallel E2E Tests", func() {
 			defer fixture.DeleteNamespace(ns)
 
 			fixture.OutputDebugOnFail(ns.Name)
+
 		})
 
 		It("verifies that all Argo CD components can run with pod-security enforce, warn, and audit of 'restricted'", func() {