Skip to content

Commit f26bedb

Browse files
committed
revert the unwanted test changes
Signed-off-by: NAVEENA S <nas@redhat.com>
1 parent 8eb1194 commit f26bedb

File tree

3 files changed

+0
-27
lines changed

3 files changed

+0
-27
lines changed

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

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,13 @@ import (
66
//lint:ignore ST1001 "This is a common practice in Gomega tests for readability."
77
. "github.com/onsi/gomega" //nolint:all
88
olmv1alpha1 "github.com/operator-framework/api/pkg/operators/v1alpha1"
9-
"github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture"
109
"github.com/redhat-developer/gitops-operator/test/openshift/e2e/ginkgo/fixture/utils"
1110
"k8s.io/client-go/util/retry"
1211
"sigs.k8s.io/controller-runtime/pkg/client"
1312
)
1413

1514
// Update will update a ClusterServiceVersion CR. Update will keep trying to update object until it succeeds, or times out.
1615
func Update(obj *olmv1alpha1.ClusterServiceVersion, modify func(*olmv1alpha1.ClusterServiceVersion)) {
17-
if fixture.EnvNonOLM() || fixture.EnvLocalRun() || fixture.EnvCI() {
18-
// Skipping CSV update as operator is not managed via OLM in these environments.
19-
// In CI environment, the operator is managed via Subscription rather than direct CSV access.
20-
return
21-
}
22-
2316
k8sClient, _ := utils.GetE2ETestKubeClient()
2417

2518
err := retry.RetryOnConflict(retry.DefaultRetry, func() error {

test/openshift/e2e/ginkgo/sequential/1-085_validate_dynamic_plugin_installation_test.go

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,11 +46,6 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
4646
return
4747
}
4848

49-
if fixture.EnvCI() {
50-
Skip("Skipping CSV-based test in CI environment where operator is managed via Subscription")
51-
return
52-
}
53-
5449
// Find CSV
5550
var csv *olmv1alpha1.ClusterServiceVersion
5651
var csvList olmv1alpha1.ClusterServiceVersionList

test/openshift/e2e/ginkgo/sequential/1-121-valiate_resource_constraints_gitopsservice_test.go

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -86,11 +86,6 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
8686
})
8787

8888
It("validates that GitOpsService can take in custom resource constraints", func() {
89-
if fixture.EnvCI() {
90-
Skip("Skipping CSV-based test in CI environment where operator is managed via Subscription")
91-
return
92-
}
93-
9489
csv := getCSV(ctx, k8sClient)
9590
Expect(csv).ToNot(BeNil())
9691
defer func() { Expect(fixture.RemoveDynamicPluginFromCSV(ctx, k8sClient)).To(Succeed()) }()
@@ -172,11 +167,6 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
172167
})
173168

174169
It("validates that GitOpsService can update resource constraints", func() {
175-
if fixture.EnvCI() {
176-
Skip("Skipping CSV-based test in CI environment where operator is managed via Subscription")
177-
return
178-
}
179-
180170
csv := getCSV(ctx, k8sClient)
181171
Expect(csv).ToNot(BeNil())
182172
defer func() { Expect(fixture.RemoveDynamicPluginFromCSV(ctx, k8sClient)).To(Succeed()) }()
@@ -248,11 +238,6 @@ var _ = Describe("GitOps Operator Sequential E2E Tests", func() {
248238
})
249239

250240
It("validates gitops plugin and backend can have different resource constraints", func() {
251-
if fixture.EnvCI() {
252-
Skip("Skipping CSV-based test in CI environment where operator is managed via Subscription")
253-
return
254-
}
255-
256241
csv := getCSV(ctx, k8sClient)
257242
Expect(csv).ToNot(BeNil())
258243
defer func() { Expect(fixture.RemoveDynamicPluginFromCSV(ctx, k8sClient)).To(Succeed()) }()

0 commit comments

Comments
 (0)