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

fix: simapp and upgrade configuration for e2e v7 upgrade (backport #3136) #3143

Merged
merged 3 commits into from
Feb 14, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Feb 14, 2023

This is an automatic backport of pull request #3136 done by Mergify.
Cherry-pick of 80f162c has failed:

On branch mergify/bp/release/v7.0.x/pr-3136
Your branch is up to date with 'origin/release/v7.0.x'.

You are currently cherry-picking commit 80f162cf.
  (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:   testing/simapp/app.go
	modified:   testing/simapp/upgrades/v7/upgrades.go

Unmerged paths:
  (use "git add/rm <file>..." as appropriate to mark resolution)
	deleted by us:   .github/workflows/e2e-upgrade.yaml
	deleted by us:   e2e/scripts/run-e2e.sh

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

* Register required types for upgrade E2E tests

* removed temporary function update

* registering additional types and specifying rc0 tag in upgrade test

* updated workflow tag

* bump version to 6.1.0

* adding keytables to params subspaces in app.go

* replace with pr docker build for testing

* adding more wait for blocks

* temporarily add new grpc services

* removing last addition

* configure store loaders for upgrade

* adding consensus params migration from baseapp

* testing without baseapp param migration

* readd baseapp params migration

* commiting updates, autocli and reflection svc

* fix in run e2e script

* adding crisis storekey to store upgrades

* removing additional wait for blocks

---------

Co-authored-by: Cian Hatton <[email protected]>
(cherry picked from commit 80f162c)

# Conflicts:
#	.github/workflows/e2e-upgrade.yaml
#	e2e/scripts/run-e2e.sh
@damiannolan damiannolan merged commit d859ad1 into release/v7.0.x Feb 14, 2023
@damiannolan damiannolan deleted the mergify/bp/release/v7.0.x/pr-3136 branch February 14, 2023 12:15
@faddat faddat mentioned this pull request Jun 23, 2023
9 tasks
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