Skip to content

Backport of skip envoy version check in ci into release/1.16.x#19316

Merged
NiniOak merged 3 commits into
release/1.16.xfrom
backport/disable_envoy_check/surely-wanted-man
Oct 20, 2023
Merged

Backport of skip envoy version check in ci into release/1.16.x#19316
NiniOak merged 3 commits into
release/1.16.xfrom
backport/disable_envoy_check/surely-wanted-man

Conversation

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

Backport

This PR is auto-generated from #19315 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:
@NiniOak
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

Use environment variables in Github Settings so script never needs to be updated to turn it off

Testing & Reproduction steps

Links

PR Checklist

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

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/disable_envoy_check/surely-wanted-man branch from eb75ac2 to 32470d8 Compare October 20, 2023 18:09
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/disable_envoy_check/surely-wanted-man branch from 32470d8 to eb75ac2 Compare October 20, 2023 18:09
@hashicorp-cla
Copy link
Copy Markdown

hashicorp-cla commented Oct 20, 2023

CLA assistant check
All committers have signed the CLA.

Copy link
Copy Markdown
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

@NiniOak NiniOak marked this pull request as ready for review October 20, 2023 18:11
@NiniOak NiniOak force-pushed the backport/disable_envoy_check/surely-wanted-man branch from 8a3164f to 234e141 Compare October 20, 2023 18:27
@NiniOak NiniOak merged commit 253a3c2 into release/1.16.x Oct 20, 2023
@NiniOak NiniOak deleted the backport/disable_envoy_check/surely-wanted-man branch October 20, 2023 18:47
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