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 chore: bump upgrade integrations tests to 1.15, 116 [NET-4743] into release/1.15.x #18147

Conversation

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

Backport

This PR is auto-generated from #18130 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:
@nfi-hashicorp
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.


1.15 and 1.16 are current. 1.14 is not

Sidequest: apparently we don't use the mirror any more


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/nfi-hashicorp-patch-1/unlikely-loving-bear branch from 0ea40d3 to 6141900 Compare July 14, 2023 21:14
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/nfi-hashicorp-patch-1/unlikely-loving-bear branch 2 times, most recently from 7f5c1d5 to 6141900 Compare July 14, 2023 21:14
@github-actions github-actions bot added type/ci Relating to continuous integration (CI) tooling for testing or releases theme/contributing Additions and enhancements to community contributing materials labels Jul 14, 2023
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

@vercel vercel bot temporarily deployed to Preview – consul-ui-staging July 14, 2023 21:14 Inactive
@vercel vercel bot temporarily deployed to Preview – consul July 14, 2023 21:15 Inactive
@nfi-hashicorp
Copy link
Contributor

@huikang I'm not actually sure if it makes sense to backport this change or not? WDYT?

@nfi-hashicorp nfi-hashicorp force-pushed the backport/nfi-hashicorp-patch-1/unlikely-loving-bear branch from 59a7fcf to 6dc86eb Compare July 17, 2023 18:55
@nfi-hashicorp nfi-hashicorp marked this pull request as ready for review July 17, 2023 18:56
@@ -467,7 +468,7 @@ jobs:
strategy:
fail-fast: false
matrix:
consul-version: [ "1.14", "1.15"]
consul-version: [ "1.15", "1.16"]
Copy link
Contributor

Choose a reason for hiding this comment

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

I think this should still be 1.14 and 1.15, since we test upgrading from previous minor versions and patch versions.

@nfi-hashicorp nfi-hashicorp merged commit 7a10f95 into release/1.15.x Jul 18, 2023
105 checks passed
@nfi-hashicorp nfi-hashicorp deleted the backport/nfi-hashicorp-patch-1/unlikely-loving-bear branch July 18, 2023 17:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
theme/contributing Additions and enhancements to community contributing materials type/ci Relating to continuous integration (CI) tooling for testing or releases
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants