Skip to content

Commit c1f269f

Browse files
Merge pull request #842 from cynepco3hahue/e2e_drop_olm_deletion
e2e upgrade: drop W/A for OLM bug
2 parents ee2f3d3 + 9c6fe00 commit c1f269f

File tree

1 file changed

+0
-18
lines changed

1 file changed

+0
-18
lines changed

functests-extended/1_performance_operator_upgrade/upgrade_operator.go

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -91,24 +91,6 @@ var _ = Describe("[rfe_id:28567][performance] Performance Addon Operator Upgrade
9191
),
9292
)).ToNot(HaveOccurred())
9393

94-
// TODO: remove the hack once https://github.com/openshift/operator-framework-olm/pull/196 merged
95-
// the W/A deletes OLM related pods to initiate OLM pods restart
96-
By("Getting OLM pods")
97-
for _, labelValue := range []string{"olm-operator", "catalog-operator"} {
98-
olmPods := &corev1.PodList{}
99-
Expect(testclient.Client.List(
100-
context.TODO(),
101-
olmPods,
102-
client.InNamespace("openshift-operator-lifecycle-manager"),
103-
client.MatchingLabels{"app": labelValue}),
104-
).To(BeNil())
105-
106-
By("Deleting OLM pods")
107-
for i := range olmPods.Items {
108-
Expect(testclient.Client.Delete(context.TODO(), &olmPods.Items[i])).To(BeNil())
109-
}
110-
}
111-
11294
By(fmt.Sprintf("Verifying that channel was updated to %s", toVersion))
11395
subscriptionWaitForUpdate(subscription.Name, namespaces.PerformanceOperator, toVersion)
11496

0 commit comments

Comments
 (0)