dd4bd08431
## Backport This PR is auto-generated from #18124 to be assessed for backporting due to the inclusion of the label backport/1.16. 🚨 >**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: @jmurret 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/merges: 409 Merge conflict [] The below text is copied from the body of the original PR. --- ### Description The following jobs started failing when go 1.20.6 was released: - `go-test-api-1-19` - `go-test-api-1-20` - `compatibility-integration-tests` - `upgrade-integration-tests` `compatibility-integration-tests` and `compatibility-integration-tests` to this testcontainers issue: https://github.com/testcontainers/testcontainers-go/issues/1359. This issue calls for testcontainers to release a new version when one of their dependencies is fixed. When that is done, we will unpin the go versions in `compatibility-integration-tests` and `compatibility-integration-tests`. ### Testing & Reproduction steps See these jobs broken in CI and then see them work with this PR. --- <details> <summary> Overview of commits </summary> - 747195f7aaf291305681bb7d8ae070761a2aef55 - 516492420bf43427f1cf89adce4d4e222bbb5aaa - f4d6ca19f8e543048e167b9c47528eeb0bdb656f - a47407115e086bb5eff6b34a08839989534b505f - 8c03b36e00719b65a87d277012dea2ac08b67442 - c50b17c46ec64dfea20f61d242e1998c804eb8f7 - 7b55f66218e3a17a0c609a1d85d45f6d1a1e6961 - 93ce5fcc61fe0292f4e0cba98c7101fbe5142139 </details> --------- Co-authored-by: temp <temp@hashicorp.com> Co-authored-by: John Murret <john.murret@hashicorp.com> Co-authored-by: Chris Thain <32781396+cthain@users.noreply.github.com> |
||
|---|---|---|
| .. | ||
| ISSUE_TEMPLATE | ||
| scripts | ||
| workflows | ||
| CODEOWNERS | ||
| CONTRIBUTING.md | ||
| dependabot.yml | ||
| go_test_coverage.txt | ||
| pr-labeler.yml | ||
| pull_request_template.md | ||
| repo_management.md | ||