From 9c24bd2c52239e03fb7c4b34ce628de9fe6f68fb Mon Sep 17 00:00:00 2001 From: Damian Nolan Date: Wed, 13 Dec 2023 10:30:32 +0100 Subject: [PATCH] chore: update e2e upgrade workflow and test configuration (#5388) * chore: update workflow to use new upgrade tag * chore: comment out tests * chore: try using single validator on gh runner test for debugging * chore: commit changes to workflow tags and wait for nodes to be in sync * chore: reinstate commented out tests --- .github/workflows/e2e-upgrade.yaml | 8 ++++---- e2e/tests/wasm/upgrade_test.go | 9 ++++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.github/workflows/e2e-upgrade.yaml b/.github/workflows/e2e-upgrade.yaml index f49abb05923..9215c15f27a 100644 --- a/.github/workflows/e2e-upgrade.yaml +++ b/.github/workflows/e2e-upgrade.yaml @@ -137,11 +137,11 @@ jobs: with: chain-image: ghcr.io/cosmos/ibc-go-wasm-simd chain-binary: simd - chain-a-tag: v7.0.0 - chain-b-tag: v7.0.0 - chain-upgrade-tag: v8.0.0-dev1 + chain-a-tag: v7.3.0-e2e-upgrade + chain-b-tag: v7.3.0-e2e-upgrade + chain-upgrade-tag: v8.0.0-e2e-upgrade upgrade-plan-name: "ibcwasm-v8" test-entry-point: "TestIBCWasmUpgradeTestSuite" test: "TestIBCWasmChainUpgrade" upload-logs: true - relayer-type: hermes \ No newline at end of file + relayer-type: hermes diff --git a/e2e/tests/wasm/upgrade_test.go b/e2e/tests/wasm/upgrade_test.go index b62e592cdfe..03b4e7f2d6c 100644 --- a/e2e/tests/wasm/upgrade_test.go +++ b/e2e/tests/wasm/upgrade_test.go @@ -28,7 +28,7 @@ import ( ) const ( - haltHeight = uint64(350) + haltHeight = uint64(325) blocksAfterUpgrade = uint64(10) ) @@ -99,6 +99,13 @@ func (s *IBCWasmUpgradeTestSuite) UpgradeChain(ctx context.Context, chain *cosmo err = testutil.WaitForBlocks(timeoutCtx, int(haltHeight-height)+1, chain) s.Require().Error(err, "chain did not halt at halt height") + var allNodes []testutil.ChainHeighter + for _, node := range chain.Nodes() { + allNodes = append(allNodes, node) + } + + testutil.WaitForInSync(ctx, chain, allNodes...) + err = chain.StopAllNodes(ctx) s.Require().NoError(err, "error stopping node(s)")