Wrap catalog update test with retry logic #2311
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
openshift-ci
bot
added
the
approved
benluddy
reviewed
Aug 2, 2021
test/e2e/catalog_e2e_test.go
Outdated
Comment on lines
1071
to
1075
| // Update the catalog image | ||
| Eventually(func() (bool, error) { | ||
| source, err = crc.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Update(context.TODO(), source, metav1.UpdateOptions{}) | ||
| if err == nil { | ||
| return true, nil | ||
| } | ||
| return false, nil | ||
| }).Should(BeTrue()) |
There was a problem hiding this comment.
Suggested change
| // Update the catalog image | |
| Eventually(func() (bool, error) { | |
| source, err = crc.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Update(context.TODO(), source, metav1.UpdateOptions{}) | |
| if err == nil { | |
| return true, nil | |
| } | |
| return false, nil | |
| }).Should(BeTrue()) | |
| // Update the catalog image | |
| Eventually(func() (error) { | |
| source, err = crc.OperatorsV1alpha1().CatalogSources(source.GetNamespace()).Update(context.TODO(), source, metav1.UpdateOptions{}) | |
| return err | |
| }).Should(Succeed()) |
kevinrizza
force-pushed
the
catalog-e2e-retry-logic
branch
from
4f39dfe
to
5a5f413
Compare
kevinrizza
force-pushed
the
catalog-e2e-retry-logic
branch
from
5a5f413
to
71e28c0
Compare
|
[APPROVALNOTIFIER] This PR is APPROVED This pull-request has been approved by: ecordell, kevinrizza The full list of commands accepted by this bot can be found here. The pull request process is described here
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
|
/lgtm |
|
/retest-required Please review the full test history for this PR and help us cut down flakes. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fix CI inconsistency by adding retries during catalog e2e test
adding catalog template adjusts image used. This test inconsistently fails due to apiserver cache invalidation responses