Skip to content

Backport of ci: fix Envoy int test versions into release/1.15.x#20965

Merged
zalimeni merged 1 commit intorelease/1.15.xfrom
backport/zalimeni/net-8947-fixup-integration-test-envoy-versions/sensibly-crisp-anteater
Apr 8, 2024
Merged

Backport of ci: fix Envoy int test versions into release/1.15.x#20965
zalimeni merged 1 commit intorelease/1.15.xfrom
backport/zalimeni/net-8947-fixup-integration-test-envoy-versions/sensibly-crisp-anteater

Conversation

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

Backport

This PR is auto-generated from #20964 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:
@zalimeni
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.


Follow-up to #20956

Nightly files do not require backport bc these only run on main, but backporting to update the test-integrations compatibility test env var.


Overview of commits

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

@hashicorp-cla-app
Copy link

hashicorp-cla-app bot commented Apr 8, 2024

CLA assistant check
All committers have signed the CLA.

@zalimeni zalimeni force-pushed the backport/zalimeni/net-8947-fixup-integration-test-envoy-versions/sensibly-crisp-anteater branch from 7648d52 to 72d41c3 Compare April 8, 2024 21:46
@zalimeni zalimeni marked this pull request as ready for review April 8, 2024 21:46
@zalimeni zalimeni enabled auto-merge (squash) April 8, 2024 21:46
@zalimeni zalimeni merged commit 74c9dcf into release/1.15.x Apr 8, 2024
@zalimeni zalimeni deleted the backport/zalimeni/net-8947-fixup-integration-test-envoy-versions/sensibly-crisp-anteater branch April 8, 2024 22:01
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.

3 participants