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

@@ -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
+      relayer-type: hermes

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)")