From c9a40912238f3204709c458ef4befc9ba22285c3 Mon Sep 17 00:00:00 2001 From: alexander-demicev Date: Tue, 12 Dec 2023 15:45:03 +0100 Subject: [PATCH] Remove downgrade e2e tests --- test/e2e/air_gapped_test.go | 28 +------------------------- test/e2e/minimal_configuration_test.go | 27 ------------------------- 2 files changed, 1 insertion(+), 54 deletions(-) diff --git a/test/e2e/air_gapped_test.go b/test/e2e/air_gapped_test.go index 41e638b02..8168287e0 100644 --- a/test/e2e/air_gapped_test.go +++ b/test/e2e/air_gapped_test.go @@ -74,6 +74,7 @@ var _ = Describe("Install Core Provider in an air-gapped environment", func() { }, }, }, + Version: "v1.4.2", }, }, } @@ -97,33 +98,6 @@ var _ = Describe("Install Core Provider in an air-gapped environment", func() { }), e2eConfig.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...) }) - It("should successfully downgrade a CoreProvider (latest -> v1.4.2)", func() { - bootstrapCluster := bootstrapClusterProxy.GetClient() - coreProvider := &operatorv1.CoreProvider{} - key := client.ObjectKey{Namespace: operatorNamespace, Name: coreProviderName} - Expect(bootstrapCluster.Get(ctx, key, coreProvider)).To(Succeed()) - - coreProvider.Spec.Version = previousCAPIVersion - - Expect(bootstrapCluster.Update(ctx, coreProvider)).To(Succeed()) - - By("Waiting for the core provider deployment to be ready") - framework.WaitForDeploymentsAvailable(ctx, framework.WaitForDeploymentsAvailableInput{ - Getter: bootstrapClusterProxy.GetClient(), - Deployment: &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: coreProviderDeploymentName, Namespace: operatorNamespace}}, - }, e2eConfig.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...) - - By("Waiting for core provider to be ready") - WaitFor(ctx, For(coreProvider).In(bootstrapCluster).ToSatisfy( - HaveStatusCondition(&coreProvider.Status.Conditions, operatorv1.ProviderInstalledCondition), - ), e2eConfig.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...) - - By("Waiting for status.IntalledVersion to be set") - WaitFor(ctx, For(coreProvider).In(bootstrapCluster).ToSatisfy(func() bool { - return ptr.Equal(coreProvider.Status.InstalledVersion, ptr.To(previousCAPIVersion)) - }), e2eConfig.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...) - }) - It("should successfully upgrade a CoreProvider (v1.4.2 -> latest)", func() { bootstrapCluster := bootstrapClusterProxy.GetClient() coreProvider := &operatorv1.CoreProvider{} diff --git a/test/e2e/minimal_configuration_test.go b/test/e2e/minimal_configuration_test.go index 0195c45c4..ac94ca0d6 100644 --- a/test/e2e/minimal_configuration_test.go +++ b/test/e2e/minimal_configuration_test.go @@ -267,33 +267,6 @@ metadata: e2eConfig.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...) }) - It("should successfully downgrade a CoreProvider (latest -> v1.4.2)", func() { - bootstrapCluster := bootstrapClusterProxy.GetClient() - coreProvider := &operatorv1.CoreProvider{} - key := client.ObjectKey{Namespace: operatorNamespace, Name: coreProviderName} - Expect(bootstrapCluster.Get(ctx, key, coreProvider)).To(Succeed()) - - coreProvider.Spec.Version = previousCAPIVersion - - Expect(bootstrapCluster.Update(ctx, coreProvider)).To(Succeed()) - - By("Waiting for the core provider deployment to be ready") - framework.WaitForDeploymentsAvailable(ctx, framework.WaitForDeploymentsAvailableInput{ - Getter: bootstrapCluster, - Deployment: &appsv1.Deployment{ObjectMeta: metav1.ObjectMeta{Name: coreProviderDeploymentName, Namespace: operatorNamespace}}, - }, e2eConfig.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...) - - By("Waiting for core provider to be ready and status.InstalledVersion to be set") - WaitFor(ctx, For(coreProvider).In(bootstrapCluster).ToSatisfy( - HaveStatusCondition(&coreProvider.Status.Conditions, operatorv1.ProviderInstalledCondition)), - e2eConfig.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...) - - By("Waiting for the core provider to have status.InstalledVersion to be set") - WaitFor(ctx, For(coreProvider).In(bootstrapCluster).ToSatisfy(func() bool { - return ptr.Equal(coreProvider.Status.InstalledVersion, &coreProvider.Spec.Version) - }), e2eConfig.GetIntervals(bootstrapClusterProxy.GetName(), "wait-controllers")...) - }) - It("should successfully upgrade a CoreProvider (v1.4.2 -> latest)", func() { bootstrapCluster := bootstrapClusterProxy.GetClient() coreProvider := &operatorv1.CoreProvider{ObjectMeta: metav1.ObjectMeta{