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 ci: always test oss and conditionally test enterprise into release/1.15.x #16897

Merged

Conversation

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

Backport

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

WARNING automatic cherry-pick of commits failed. Commits will require human attention.

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 has a passing CI run in enterprise: https://github.com/hashicorp/consul-enterprise/actions/runs/4568643952

Testing & Reproduction steps

Links

PR Checklist

  • updated test coverage
  • external facing docs updated
  • not a security concern

Overview of commits

@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/jm/test-oss-and-ent/roughly-allowed-finch branch from a54f1ab to 4fa1081 Compare April 5, 2023 22:50
@hc-github-team-consul-core hc-github-team-consul-core force-pushed the backport/jm/test-oss-and-ent/roughly-allowed-finch branch from 4fa1081 to a54f1ab Compare April 5, 2023 22:50
@hashicorp-cla
Copy link

hashicorp-cla commented Apr 5, 2023

CLA assistant check
All committers have signed the CLA.

Copy link

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

@jmurret jmurret force-pushed the backport/jm/test-oss-and-ent/roughly-allowed-finch branch from 1b83bd7 to cdc18d9 Compare April 5, 2023 22:54
@jmurret jmurret marked this pull request as ready for review April 5, 2023 23:09
@jmurret jmurret force-pushed the backport/jm/test-oss-and-ent/roughly-allowed-finch branch from 8f8e53e to e8e2ea7 Compare April 5, 2023 23:09
@jmurret jmurret force-pushed the backport/jm/test-oss-and-ent/roughly-allowed-finch branch from e8e2ea7 to 024c782 Compare April 5, 2023 23:33
@jmurret jmurret merged commit a3d3607 into release/1.15.x Apr 5, 2023
@jmurret jmurret deleted the backport/jm/test-oss-and-ent/roughly-allowed-finch branch April 5, 2023 23:33
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