Skip to content

Improve wait for node in e2e runner for long catch-up times (backport #375)#435

Merged
sergio-mena merged 6 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-375
Mar 1, 2023
Merged

Improve wait for node in e2e runner for long catch-up times (backport #375)#435
sergio-mena merged 6 commits intov0.37.xfrom
mergify/bp/v0.37.x/pr-375

Conversation

@mergify
Copy link
Contributor

@mergify mergify bot commented Mar 1, 2023

This is an automatic backport of pull request #375 done by Mergify.
Cherry-pick of 167a845 has failed:

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

You are currently cherry-picking commit 167a8456d.
  (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:
	modified:   test/e2e/Makefile
	new file:   test/e2e/networks/long.toml
	modified:   test/e2e/pkg/testnet.go
	modified:   test/e2e/runner/rpc.go
	modified:   test/e2e/runner/wait.go

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   state/txindex/indexer_service.go

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/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

* e2e: Flexible timeout while waiting for a node

* QA: added big e2e network manifest

* Don't build latest locally, but rely on what has been released

* Do not build `latest`=`local` locally. Long test upgrades from `latest` to `local`.

* CatchingUp shouldn't be checked when waiting for height 0

* Adjust retention to support evidence gathering

* fix typo

* More adjestments for long-running e2e manifests

* Makes wait proportional to the height, so nodes have more time to cacthup on long runs. Waits for all nodes for the duration of `timeout`, not each node for the duration of `timeout`.

---------

Co-authored-by: lasarojc <lasaro@informal.systems>
(cherry picked from commit 167a845)

# Conflicts:
#	state/txindex/indexer_service.go
@mergify mergify bot requested a review from a team as a code owner March 1, 2023 17:48
@mergify mergify bot added the conflicts label Mar 1, 2023
sergio-mena and others added 3 commits March 1, 2023 18:51
* e2e: Flexible timeout while waiting for a node

* QA: added big e2e network manifest

* Don't build latest locally, but rely on what has been released

* Do not build `latest`=`local` locally. Long test upgrades from `latest` to `local`.

* CatchingUp shouldn't be checked when waiting for height 0

* Adjust retention to support evidence gathering

* fix typo

* More adjestments for long-running e2e manifests

* Makes wait proportional to the height, so nodes have more time to cacthup on long runs. Waits for all nodes for the duration of `timeout`, not each node for the duration of `timeout`.

---------

Co-authored-by: lasarojc <lasaro@informal.systems>
@sergio-mena sergio-mena merged commit ff7bd07 into v0.37.x Mar 1, 2023
@sergio-mena sergio-mena deleted the mergify/bp/v0.37.x/pr-375 branch March 1, 2023 19:34
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants