Skip to content

Backport of Fix ENT Tests Now that They Are Running Again 🏃 into release/1.2.x#3082

Merged
nathancoleman merged 1 commit intorelease/1.2.xfrom
backport/1.2.x/dans/fix-enterprise-flakes
Oct 16, 2023
Merged

Backport of Fix ENT Tests Now that They Are Running Again 🏃 into release/1.2.x#3082
nathancoleman merged 1 commit intorelease/1.2.xfrom
backport/1.2.x/dans/fix-enterprise-flakes

Conversation

@nathancoleman
Copy link
Member

@nathancoleman nathancoleman commented Oct 16, 2023

Backport

This PR is manually generated from #3077 to be assessed for backporting.

The below text is copied from the body of the original PR.


ENT tests were just turned back on in CI. This revealed some failing test cases. This PR attempts to get everything in working order.

test: fix tests that are failing on main
@nathancoleman nathancoleman added pr/no-changelog PR does not need a corresponding .changelog entry pr/no-backport signals that a PR will not contain a backport label labels Oct 16, 2023
@nathancoleman nathancoleman changed the base branch from main to release/1.2.x October 16, 2023 17:16
@nathancoleman nathancoleman changed the title Backport of Fix ENT Tests Now that They Are Running Again 🏃 to release/1.2.x Backport of Fix ENT Tests Now that They Are Running Again 🏃 into release/1.2.x Oct 16, 2023
@nathancoleman
Copy link
Member Author

Re-opening to trigger CI

Copy link
Member

@zalimeni zalimeni left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Backport changes LGTM! ❓ Should we also backport to 1.1.x, since it'll continue being released past Oct. 31?

@nathancoleman
Copy link
Member Author

@zalimeni good question - I've manually backported to release/1.1.x with #3084

@nathancoleman nathancoleman merged commit 24e10f1 into release/1.2.x Oct 16, 2023
@nathancoleman nathancoleman deleted the backport/1.2.x/dans/fix-enterprise-flakes branch October 16, 2023 19:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

pr/no-backport signals that a PR will not contain a backport label pr/no-changelog PR does not need a corresponding .changelog entry theme/testing Related to testing

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants