Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport of FLAKEY_TEST: Add retry to outbound request for ProxyLifecycleShutdown… into release/1.1.x #4004

Conversation

hc-github-team-consul-core
Copy link
Collaborator

Backport

This PR is auto-generated from #3999 to be assessed for backporting due to the inclusion of the label backport/1.1.x.

🚨

Warning automatic cherry-pick of commits failed. If the first commit failed,
you will see a blank no-op commit below. If at least one commit succeeded, you
will see the cherry-picked commits up to, not including, the commit where
the merge conflict occurred.

The person who merged in the original PR is:
@NiniOak
This person should manually cherry-pick the original PR into a new backport PR,
and close this one when the manual backport PR is merged in.

merge conflict error: POST https://api.github.com/repos/hashicorp/consul-k8s/merges: 409 Merge conflict []

The below text is copied from the body of the original PR.


Changes proposed in this PR

  • Test fails intermittently in CI (for some reason it only fails in cloud environment not kind clusters) see example here
  • Add retry to outbound API calls to improve chance of success.
    • if error occures, log the error and mark the current attempt as failed, trigger a retry.
    • If error does not exist, check if the output contains the specific error message. If the condition fails, log the error message and trigger a retry.

How I've tested this PR

CI should pass

How I expect reviewers to test this PR

CI should pass

Checklist


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/fix_flakey_ProxyLifecycleShutdownTest/purely-concrete-cowbird branch from 2585183 to 2ce5918 Compare May 17, 2024 17:18
@NiniOak NiniOak marked this pull request as ready for review May 17, 2024 18:36
@NiniOak NiniOak merged commit f263ba2 into release/1.1.x May 17, 2024
42 of 43 checks passed
@NiniOak NiniOak deleted the backport/fix_flakey_ProxyLifecycleShutdownTest/purely-concrete-cowbird branch May 17, 2024 18:46
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants