Skip to content

Backport of test: add test helper to detect if the current build is enterprise into release/1.17.x#19612

Merged
rboyer merged 1 commit into
release/1.17.xfrom
backport/rboyer/versiontest/monthly-hip-terrier
Nov 13, 2023
Merged

Backport of test: add test helper to detect if the current build is enterprise into release/1.17.x#19612
rboyer merged 1 commit into
release/1.17.xfrom
backport/rboyer/versiontest/monthly-hip-terrier

Conversation

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

Backport

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

🚨

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:
@rboyer
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

This can help conditionally change test behavior if the test is executing in enterprise without the need to split the test with build tags.


Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/rboyer/versiontest/monthly-hip-terrier branch 2 times, most recently from 8a78e39 to 607420a Compare November 13, 2023 16:30
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

@vercel vercel Bot temporarily deployed to Preview – consul November 13, 2023 16:41 Inactive
…19201)

This can help conditionally change test behavior if the test is executing in enterprise without the need to split the test with build tags.
@rboyer rboyer force-pushed the backport/rboyer/versiontest/monthly-hip-terrier branch from 607420a to caa34f0 Compare November 13, 2023 16:53
@rboyer rboyer marked this pull request as ready for review November 13, 2023 16:53
@rboyer rboyer enabled auto-merge (squash) November 13, 2023 16:53
@rboyer rboyer merged commit b0d7faa into release/1.17.x Nov 13, 2023
@rboyer rboyer deleted the backport/rboyer/versiontest/monthly-hip-terrier branch November 13, 2023 17:12
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