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 bump testcontainers-go from 0.22.0 and remove pinned go version in in… into release/1.15.x #18407

Conversation

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

Backport

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

🚨

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:
@huikang
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.


Bump testcontainers-go from 0.22.0 and removed pinned go version in integration tests

We pinned go versions to 1.20.5 for integration test due to a recent change in Go, which breaks testcontainers-go packages (#18124). The latest release of testcontainers-go fixes this issue, so bump the version of testcontainers-go and removed the pinned version of go.

Description

Testing & Reproduction steps

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • appropriate backport labels added
  • not a security concern

Overview of commits

@hashicorp-cla
Copy link

hashicorp-cla commented Aug 8, 2023

CLA assistant check
All committers have signed the CLA.

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Auto approved Consul Bot automated PR

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging August 8, 2023 18:11 Inactive
@vercel vercel bot temporarily deployed to Preview – consul August 8, 2023 18:19 Inactive
@huikang huikang marked this pull request as ready for review August 8, 2023 22:58
@huikang huikang force-pushed the backport/upgrade-testcontainer-version/mainly-romantic-chicken branch from 7f2c90e to c96cc61 Compare August 9, 2023 00:32
@huikang huikang force-pushed the backport/upgrade-testcontainer-version/mainly-romantic-chicken branch from c96cc61 to bb81a9c Compare August 9, 2023 00:33
@huikang huikang merged commit bc5a357 into release/1.15.x Aug 9, 2023
103 checks passed
@huikang huikang deleted the backport/upgrade-testcontainer-version/mainly-romantic-chicken branch August 9, 2023 01:53
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.

4 participants