Merge pull request #865 from openshift-cherrypick-robot/cherry-pick-862-to-release-4.14

[release-4.14] OCPBUGS-41872: Fix e2e flake: upgrade CRD with deprecated version

Author: openshift-merge-bot[bot]

staging/operator-lifecycle-manager/test/e2e/installplan_e2e_test.go

@@ -1472,7 +1472,7 @@ var _ = Describe("Install Plan", func() {
 						},
 						{
 							Name:    "v1alpha1",
-							Served:  false,
+							Served:  true,
 							Storage: false,
 							Schema: &apiextensionsv1.CustomResourceValidation{
 								OpenAPIV3Schema: &apiextensionsv1.JSONSchemaProps{
@@ -1632,7 +1632,6 @@ var _ = Describe("Install Plan", func() {
 			fetchedInstallPlan, err = fetchInstallPlan(GinkgoT(), crc, installPlanName, generatedNamespace.GetName(), buildInstallPlanPhaseCheckFunc(operatorsv1alpha1.InstallPlanPhaseComplete, operatorsv1alpha1.InstallPlanPhaseFailed))
 			require.NoError(GinkgoT(), err)
 			GinkgoT().Logf("Install plan %s fetched with status %s", fetchedInstallPlan.GetName(), fetchedInstallPlan.Status.Phase)
-
 			require.Equal(GinkgoT(), tt.expectedPhase, fetchedInstallPlan.Status.Phase)
 
 			// Ensure correct in-cluster resource(s)
@@ -1689,7 +1688,6 @@ var _ = Describe("Install Plan", func() {
 			validateCRDVersions(GinkgoT(), c, tt.oldCRD.GetName(), expectedVersions)
 			GinkgoT().Logf("All expected resources resolved %s", fetchedCSV.Status.Phase)
 		}, tableEntries)
-
 	})
 
 	Describe("update catalog for subscription", func() {