From 47be19627c5f92e956d997814ee0ee6e22c02a31 Mon Sep 17 00:00:00 2001 From: maskpp Date: Fri, 30 Aug 2024 14:53:08 +0800 Subject: [PATCH 1/7] upgrade hive full sync and snap sync --- .github/workflows/taiko-client--hive_test.yml | 2 +- .../integration_test/hive_test.go | 19 ++++++++----------- 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/.github/workflows/taiko-client--hive_test.yml b/.github/workflows/taiko-client--hive_test.yml index 4a623332f8b..b77129af1ae 100644 --- a/.github/workflows/taiko-client--hive_test.yml +++ b/.github/workflows/taiko-client--hive_test.yml @@ -2,7 +2,7 @@ name: "Taiko Client Hive Tests" on: push: - branches: [main] + branches: [hive_full_snap_upgrade_] paths: - "packages/taiko-client/**" - "go.mod" diff --git a/packages/taiko-client/integration_test/hive_test.go b/packages/taiko-client/integration_test/hive_test.go index 522f6cf65db..a79bc4cb007 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(fmt.Sprintf("taiko-reorg/taiko-reorg/clusters(%d)", len(clientGroups)), func(t *testing.T) { + testDenebReorg(t, "taiko-reorg/taiko-reorg", clientGroups) }) } From 64a9e216036d34aa618dc39519104be89541f9f3 Mon Sep 17 00:00:00 2001 From: maskpp Date: Fri, 30 Aug 2024 15:32:02 +0800 Subject: [PATCH 2/7] change merge-gatekeeper timeout and trigger hive test --- .github/workflows/merge-gatekeeper.yml | 1 + packages/taiko-client/integration_test/hive_test.go | 1 + 2 files changed, 2 insertions(+) diff --git a/.github/workflows/merge-gatekeeper.yml b/.github/workflows/merge-gatekeeper.yml index e496200bb33..9040ada2a3a 100644 --- a/.github/workflows/merge-gatekeeper.yml +++ b/.github/workflows/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 a79bc4cb007..3b72a865e25 100644 --- a/packages/taiko-client/integration_test/hive_test.go +++ b/packages/taiko-client/integration_test/hive_test.go @@ -52,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, From 45f3da0e91c9ffc43735b20509d16d1f34f6889c Mon Sep 17 00:00:00 2001 From: maskpp Date: Fri, 30 Aug 2024 15:46:58 +0800 Subject: [PATCH 3/7] revert to main branch --- .github/workflows/taiko-client--hive_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/taiko-client--hive_test.yml b/.github/workflows/taiko-client--hive_test.yml index b77129af1ae..4a623332f8b 100644 --- a/.github/workflows/taiko-client--hive_test.yml +++ b/.github/workflows/taiko-client--hive_test.yml @@ -2,7 +2,7 @@ name: "Taiko Client Hive Tests" on: push: - branches: [hive_full_snap_upgrade_] + branches: [main] paths: - "packages/taiko-client/**" - "go.mod" From 29ecef8c88645558e2957fefceaff1ed5f95be4d Mon Sep 17 00:00:00 2001 From: maskpp Date: Mon, 9 Sep 2024 23:07:21 +0800 Subject: [PATCH 4/7] fix reorg test --- packages/taiko-client/integration_test/hive_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/taiko-client/integration_test/hive_test.go b/packages/taiko-client/integration_test/hive_test.go index 3b72a865e25..66731fe199d 100644 --- a/packages/taiko-client/integration_test/hive_test.go +++ b/packages/taiko-client/integration_test/hive_test.go @@ -43,8 +43,8 @@ func TestHiveHandler(t *testing.T) { }) // Multi clusters reorg test. - t.Run(fmt.Sprintf("taiko-reorg/taiko-reorg/clusters(%d)", len(clientGroups)), func(t *testing.T) { - testDenebReorg(t, "taiko-reorg/taiko-reorg", clientGroups) + t.Run("taiko-reorg/taiko-reorg/clusters(1)", func(t *testing.T) { + testDenebReorg(t, "taiko-reorg/taiko-reorg", [][]string{clientGroups[0]}) }) } From 19e9ac4a09b226b4c7d3cd63fb3fc4bffbc3e7a6 Mon Sep 17 00:00:00 2001 From: maskpp Date: Mon, 9 Sep 2024 23:08:49 +0800 Subject: [PATCH 5/7] fix reorg test --- packages/taiko-client/integration_test/hive_test.go | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/taiko-client/integration_test/hive_test.go b/packages/taiko-client/integration_test/hive_test.go index 66731fe199d..6aea46425d8 100644 --- a/packages/taiko-client/integration_test/hive_test.go +++ b/packages/taiko-client/integration_test/hive_test.go @@ -69,6 +69,7 @@ func testDenebReorg(t *testing.T, simPattern string, clientGroups [][]string) { handler, err := hivesim.NewHiveFramework(&hivesim.HiveConfig{ BuildOutput: false, ContainerOutput: true, + DockerPull: false, BaseDir: os.Getenv("HIVE_DIR"), SimPattern: "taiko", SimTestPattern: simPattern, From ad64297f4225adb583e73628ab2767dc6f2e5380 Mon Sep 17 00:00:00 2001 From: maskpp Date: Mon, 9 Sep 2024 23:11:26 +0800 Subject: [PATCH 6/7] trigger hive test --- .github/workflows/taiko-client--hive_test.yml | 2 +- packages/taiko-client/integration_test/hive_test.go | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/workflows/taiko-client--hive_test.yml b/.github/workflows/taiko-client--hive_test.yml index 4a623332f8b..b77129af1ae 100644 --- a/.github/workflows/taiko-client--hive_test.yml +++ b/.github/workflows/taiko-client--hive_test.yml @@ -2,7 +2,7 @@ name: "Taiko Client Hive Tests" on: push: - branches: [main] + branches: [hive_full_snap_upgrade_] paths: - "packages/taiko-client/**" - "go.mod" diff --git a/packages/taiko-client/integration_test/hive_test.go b/packages/taiko-client/integration_test/hive_test.go index 6aea46425d8..66731fe199d 100644 --- a/packages/taiko-client/integration_test/hive_test.go +++ b/packages/taiko-client/integration_test/hive_test.go @@ -69,7 +69,6 @@ func testDenebReorg(t *testing.T, simPattern string, clientGroups [][]string) { handler, err := hivesim.NewHiveFramework(&hivesim.HiveConfig{ BuildOutput: false, ContainerOutput: true, - DockerPull: false, BaseDir: os.Getenv("HIVE_DIR"), SimPattern: "taiko", SimTestPattern: simPattern, From 3d52ceec11202ca508ce9e8659a68ad6ead640a4 Mon Sep 17 00:00:00 2001 From: maskpp Date: Thu, 12 Sep 2024 15:00:28 +0800 Subject: [PATCH 7/7] revert to main branch --- .github/workflows/taiko-client--hive_test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/taiko-client--hive_test.yml b/.github/workflows/taiko-client--hive_test.yml index b77129af1ae..4a623332f8b 100644 --- a/.github/workflows/taiko-client--hive_test.yml +++ b/.github/workflows/taiko-client--hive_test.yml @@ -2,7 +2,7 @@ name: "Taiko Client Hive Tests" on: push: - branches: [hive_full_snap_upgrade_] + branches: [main] paths: - "packages/taiko-client/**" - "go.mod"