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 [NET-4895] ci - api tests and consul container tests error because of dependency bugs with go 1.20.6. Pin go to 1.20.5. into release/1.14.x #18126

Merged

Conversation

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

Backport

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

🚨

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: testcontainers/testcontainers-go#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.


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/jm/go-testcontainers/forcibly-true-albacore branch from fdfb11c to a747ed4 Compare July 13, 2023 19:27
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/jm/go-testcontainers/forcibly-true-albacore branch from a747ed4 to fdfb11c Compare July 13, 2023 19:27
@hashicorp-cla
Copy link

hashicorp-cla commented Jul 13, 2023

CLA assistant check

Thank you for your submission! We require that all contributors sign our Contributor License Agreement ("CLA") before we can accept the contribution. Read and sign the agreement

Learn more about why HashiCorp requires a CLA and what the CLA includes


1 out of 2 committers have signed the CLA.

  • jmurret
  • temp

temp seems not to be a GitHub user.
You need a GitHub account to be able to sign the CLA. If you already have a GitHub account, please add the email address used for this commit to your account.

Have you signed the CLA already but the status is still pending? Recheck it.

Copy link
Collaborator

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

… dependency bugs with go 1.20.6. Pin go to 1.20.5. (#18124)

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:
testcontainers/testcontainers-go#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`.

See these jobs broken in CI and then see them work with this PR.

---------

Co-authored-by: Chris Thain <32781396+cthain@users.noreply.github.com>
@jmurret jmurret marked this pull request as ready for review July 13, 2023 19:57
@jmurret jmurret enabled auto-merge (squash) July 13, 2023 20:11
@jmurret jmurret disabled auto-merge July 13, 2023 20:54
@jmurret jmurret merged commit 14c3bc8 into release/1.14.x Jul 13, 2023
@jmurret jmurret deleted the backport/jm/go-testcontainers/forcibly-true-albacore branch July 13, 2023 20:54
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