Skip to content

Backport of ci: always test oss and conditionally test enterprise into release/1.14.x#16896

Merged
jmurret merged 1 commit intorelease/1.14.xfrom
backport/jm/test-oss-and-ent/vastly-above-mink
Apr 5, 2023
Merged

Backport of ci: always test oss and conditionally test enterprise into release/1.14.x#16896
jmurret merged 1 commit intorelease/1.14.xfrom
backport/jm/test-oss-and-ent/vastly-above-mink

Conversation

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

Backport

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

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/vastly-above-mink branch from d584766 to 9f2474a 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
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

@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/vastly-above-mink branch from 72afb37 to 9d81494 Compare April 5, 2023 23:09
@jmurret jmurret merged commit dd893a5 into release/1.14.x Apr 5, 2023
@jmurret jmurret deleted the backport/jm/test-oss-and-ent/vastly-above-mink 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