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

e2e: Add load_max_txs option to manifest (backport #2094) #2334

Merged
merged 6 commits into from
Feb 15, 2024

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 14, 2024

This is an automatic backport of pull request #2094 done by Mergify.
Cherry-pick of 6722f33 has failed:

On branch mergify/bp/v0.38.x/pr-2094
Your branch is up to date with 'origin/v0.38.x'.

You are currently cherry-picking commit 6722f3375.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	new file:   .changelog/unreleased/improvements/2094-e2e-load-max-txs.md
	modified:   test/e2e/pkg/manifest.go
	modified:   test/e2e/runner/load.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   test/e2e/pkg/testnet.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

An option to set a limit to the number of transactions generated by the
`load` command of the e2e framework.

<!--

Please add a reference to the issue that this PR addresses and indicate
which
files are most critical to review. If it fully addresses a particular
issue,
please include "Closes #XXX" (where "XXX" is the issue number).

If this PR is non-trivial/large/complex, please ensure that you have
either
created an issue that the team's had a chance to respond to, or had some
discussion with the team prior to submitting substantial pull requests.
The team
can be reached via GitHub Discussions or the Cosmos Network Discord
server in
the #cometbft channel. GitHub Discussions is preferred over Discord as
it
allows us to keep track of conversations topically.
https://github.com/cometbft/cometbft/discussions

If the work in this PR is not aligned with the team's current
priorities, please
be advised that it may take some time before it is merged - especially
if it has
not yet been discussed with the team.

See the project board for the team's current priorities:
https://github.com/orgs/cometbft/projects/1

-->

---

#### PR checklist

- [ ] Tests written/updated
- [x] Changelog entry added in `.changelog` (we use
[unclog](https://github.com/informalsystems/unclog) to manage our
changelog)
- [ ] Updated relevant documentation (`docs/` or `spec/`) and code
comments

(cherry picked from commit 6722f33)

# Conflicts:
#	test/e2e/pkg/testnet.go
@mergify mergify bot requested a review from a team as a code owner February 14, 2024 08:59
@mergify mergify bot added the conflicts label Feb 14, 2024
@mergify mergify bot mentioned this pull request Feb 14, 2024
3 tasks
@hvanz hvanz removed the conflicts label Feb 14, 2024
@hvanz
Copy link
Member

hvanz commented Feb 14, 2024

Waiting to fix linting errors in unrelated files before merging is allowed.

@melekes
Copy link
Contributor

melekes commented Feb 15, 2024

#2349

melekes added a commit that referenced this pull request Feb 15, 2024
… (#2333)

This is an automatic backport of pull request #2328 done by
[Mergify](https://mergify.com).

Requires #2334

---


<details>
<summary>Mergify commands and options</summary>

<br />

More conditions and actions can be found in the
[documentation](https://docs.mergify.com/).

You can also trigger Mergify actions by commenting on this pull request:

- `@Mergifyio refresh` will re-evaluate the rules
- `@Mergifyio rebase` will rebase this PR on its base branch
- `@Mergifyio update` will merge the base branch into this PR
- `@Mergifyio backport <destination>` will backport this PR on
`<destination>` branch

Additionally, on Mergify [dashboard](https://dashboard.mergify.com) you
can:

- look at your merge queues
- generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com
</details>

Co-authored-by: Hernán Vanzetto <15466498+hvanz@users.noreply.github.com>
Co-authored-by: Anton Kaliaev <anton.kalyaev@gmail.com>
@hvanz hvanz merged commit 8d2d76d into v0.38.x Feb 15, 2024
21 checks passed
@hvanz hvanz deleted the mergify/bp/v0.38.x/pr-2094 branch February 15, 2024 16: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.

2 participants