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 fix staking benchmark (#6463) to stable 2412 and disable flaky tests #6475

Open
wants to merge 12 commits into
base: stable2412
Choose a base branch
from

Conversation

gui1117
Copy link
Contributor

@gui1117 gui1117 commented Nov 14, 2024

Found by @ggwpez

Fix staking benchmark, error was introduced when migrating to v2: #6025

Also disable flaky tests similar to #6749:

  • zombienet-polkadot-functional-0017-sync-backing
  • zombienet-polkadot-elastic-scaling-0002-elastic-scaling-doesnt-break-parachains

@gui1117 gui1117 added the A3-backport Pull request is already reviewed well in another branch. label Nov 14, 2024
Copy link

This pull request is amending an existing release. Please proceed with extreme caution,
as to not impact downstream teams that rely on the stability of it. Some things to consider:

  • Backports are only for 'patch' or 'minor' changes. No 'major' or other breaking change.
  • Should be a legit fix for some bug, not adding tons of new features.
  • Must either be already audited or not need an audit.
Emergency Bypass

If you really need to bypass this check: add validate: false to each crate
in the Prdoc where a breaking change is introduced. This will release a new major
version of that crate and all its reverse dependencies and basically break the release.

@gui1117 gui1117 changed the title Fix staking benchmark (#6463) Backport fix staking benchmark (#6463) to stable 2412 Nov 14, 2024
ggwpez
ggwpez previously approved these changes Nov 14, 2024
georgepisaltu
georgepisaltu previously approved these changes Nov 14, 2024
davidk-pt
davidk-pt previously approved these changes Nov 14, 2024
@gui1117 gui1117 enabled auto-merge (squash) November 14, 2024 09:46
Found by @ggwpez

Fix staking benchmark, error was introduced when migrating to v2:
#6025

---------

Co-authored-by: GitHub Action <[email protected]>
(cherry picked from commit a1af8ed)
@gui1117 gui1117 force-pushed the gui-backport-6463-to-stable2412 branch from d072bf0 to 090676f Compare November 15, 2024 01:35
@gui1117
Copy link
Contributor Author

gui1117 commented Nov 15, 2024

I forced push because I needed to sign the commits

@gui1117 gui1117 disabled auto-merge December 1, 2024 23:47
@gui1117 gui1117 enabled auto-merge (squash) December 1, 2024 23:48
@gui1117
Copy link
Contributor Author

gui1117 commented Dec 2, 2024

merging is blocked: The base branch does not allow updates. But can we merge it still? the benchmark doesn't make any sense without this PR.

maybe I am wrong, let's trigger CI again

@gui1117
Copy link
Contributor Author

gui1117 commented Dec 4, 2024

I can't make the test continuous-integration/gitlab-zombienet-polkadot-functional-0017-sync-backing pass.

@gui1117 gui1117 dismissed stale reviews from ggwpez, georgepisaltu, and davidk-pt via 64d1e32 December 4, 2024 23:54
@gui1117 gui1117 requested a review from a team as a code owner December 4, 2024 23:54
@gui1117 gui1117 force-pushed the gui-backport-6463-to-stable2412 branch from b9b32e9 to e4dad85 Compare December 4, 2024 23:58
@gui1117 gui1117 changed the title Backport fix staking benchmark (#6463) to stable 2412 Backport fix staking benchmark (#6463) to stable 2412 and disable flaky tests Dec 5, 2024
@gui1117
Copy link
Contributor Author

gui1117 commented Dec 5, 2024

CI is finally green, maybe merging is blocked for backport now.

@gui1117 gui1117 disabled auto-merge December 6, 2024 11:07
@gui1117 gui1117 enabled auto-merge (squash) December 6, 2024 11:08
@gui1117
Copy link
Contributor Author

gui1117 commented Dec 30, 2024

To backport to 2412-1 should it still be merged into the 2412 branch?

@gui1117 gui1117 disabled auto-merge December 31, 2024 12:56
@gui1117 gui1117 enabled auto-merge (squash) December 31, 2024 12:56
@gui1117
Copy link
Contributor Author

gui1117 commented Jan 2, 2025

@paritytech/release-engineering This PR can be merged or closed

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A3-backport Pull request is already reviewed well in another branch.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants