Skip to content

Commit

Permalink
Merge pull request #29277 from tmshort/rm-progressing
Browse files Browse the repository at this point in the history
NO-ISSUE: OLMv1: Remove progressing checks during API transition
  • Loading branch information
openshift-merge-bot[bot] authored Nov 9, 2024
2 parents 9cffbdd + a7fbabd commit 23ca269
Showing 1 changed file with 0 additions and 4 deletions.
4 changes: 0 additions & 4 deletions test/extended/olm/olmv1.go
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,6 @@ var _ = g.Describe("[sig-olmv1] OLMv1 Catalogs", func() {
var conditions []metav1.Condition
err = json.Unmarshal([]byte(output), &conditions)
o.Expect(err).NotTo(o.HaveOccurred())
o.Expect(meta.IsStatusConditionPresentAndEqual(conditions, "Progressing", metav1.ConditionFalse)).To(o.BeTrue())
o.Expect(meta.IsStatusConditionPresentAndEqual(conditions, "Serving", metav1.ConditionTrue)).To(o.BeTrue())
}
})
Expand Down Expand Up @@ -156,9 +155,6 @@ var _ = g.Describe("[sig-olmv1] OLMv1 operator installation", func() {
if err != nil {
return false, fmt.Errorf("error in json.Unmarshal(%v): %v", output, err)
}
if !meta.IsStatusConditionPresentAndEqual(conditions, "Progressing", metav1.ConditionFalse) {
return false, nil
}
if !meta.IsStatusConditionPresentAndEqual(conditions, "Installed", metav1.ConditionTrue) {
return false, nil
}
Expand Down

0 comments on commit 23ca269

Please sign in to comment.