Skip to content

Backport of chore: bump upgrade integrations tests to 1.15, 116 [NET-4743] into release/1.16.x#18148

Merged
nfi-hashicorp merged 2 commits intorelease/1.16.xfrom
backport/nfi-hashicorp-patch-1/brightly-upright-quetzal
Jul 18, 2023
Merged

Backport of chore: bump upgrade integrations tests to 1.15, 116 [NET-4743] into release/1.16.x#18148
nfi-hashicorp merged 2 commits intorelease/1.16.xfrom
backport/nfi-hashicorp-patch-1/brightly-upright-quetzal

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.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:
@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/brightly-upright-quetzal branch from cf90a98 to fecbaca Compare July 14, 2023 21:14
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/nfi-hashicorp-patch-1/brightly-upright-quetzal branch from fecbaca to cf90a98 Compare July 14, 2023 21:14
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

@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
@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 nfi-hashicorp force-pushed the backport/nfi-hashicorp-patch-1/brightly-upright-quetzal branch from e7d89c6 to 199805b Compare July 17, 2023 18:52
@nfi-hashicorp nfi-hashicorp marked this pull request as ready for review July 17, 2023 18:56
fail-fast: false
matrix:
consul-version: [ "1.14", "1.15"]
consul-version: [ "1.15", "1.16"]
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
consul-version: [ "1.15", "1.16"]
consul-version: [ "1.14", "1.15"]

@nfi-hashicorp nfi-hashicorp merged commit 8012e06 into release/1.16.x Jul 18, 2023
@nfi-hashicorp nfi-hashicorp deleted the backport/nfi-hashicorp-patch-1/brightly-upright-quetzal branch July 18, 2023 17:04
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.

3 participants