diff --git a/.github/workflows/repo--merge-gatekeeper.yml b/.github/workflows/repo--merge-gatekeeper.yml index e496200bb33..9040ada2a3a 100644 --- a/.github/workflows/repo--merge-gatekeeper.yml +++ b/.github/workflows/repo--merge-gatekeeper.yml @@ -17,4 +17,5 @@ jobs: - name: Run Merge Gatekeeper uses: upsidr/merge-gatekeeper@v1 with: + timeout: 1200 token: ${{ secrets.GITHUB_TOKEN }} diff --git a/packages/taiko-client/integration_test/hive_test.go b/packages/taiko-client/integration_test/hive_test.go index 522f6cf65db..66731fe199d 100644 --- a/packages/taiko-client/integration_test/hive_test.go +++ b/packages/taiko-client/integration_test/hive_test.go @@ -34,20 +34,17 @@ func TestHiveHandler(t *testing.T) { }, } - // Single cluster test. - t.Run("taiko-genesis/l2-full-sync/clusters(1)", func(t *testing.T) { - testDenebGenesis(t, "taiko-genesis/l2-full-sync", [][]string{clientGroups[0]}) - }) - t.Run("taiko-reorg/l2-full-sync/clusters(1)", func(t *testing.T) { - testDenebReorg(t, "taiko-reorg/l2-full-sync", [][]string{clientGroups[0]}) - }) - - // Multi clusters test. + // Multi clusters full sync and snap sync tests. t.Run(fmt.Sprintf("taiko-genesis/l2-snap-sync/clusters(%d)", len(clientGroups)), func(t *testing.T) { testDenebGenesis(t, "taiko-genesis/l2-snap-sync", clientGroups) }) - t.Run(fmt.Sprintf("taiko-reorg/l2-snap-sync/clusters(%d)", len(clientGroups)), func(t *testing.T) { - testDenebReorg(t, "taiko-reorg/l2-snap-sync", clientGroups) + t.Run(fmt.Sprintf("taiko-genesis/l2-full-sync/clusters(%d)", len(clientGroups)), func(t *testing.T) { + testDenebGenesis(t, "taiko-genesis/l2-full-sync", clientGroups) + }) + + // Multi clusters reorg test. + t.Run("taiko-reorg/taiko-reorg/clusters(1)", func(t *testing.T) { + testDenebReorg(t, "taiko-reorg/taiko-reorg", [][]string{clientGroups[0]}) }) } @@ -55,6 +52,7 @@ func testDenebGenesis(t *testing.T, simPattern string, clientGroups [][]string) handler, err := hivesim.NewHiveFramework(&hivesim.HiveConfig{ BuildOutput: false, ContainerOutput: true, + DockerPull: true, BaseDir: os.Getenv("HIVE_DIR"), SimPattern: "taiko", SimTestPattern: simPattern,