poc

testing/endtoend/BUILD.bazel

@@ -5,6 +5,7 @@ load("@prysm//tools/go:def.bzl", "go_test")
 # gazelle:exclude mainnet_scenario_e2e_test.go
 # gazelle:exclude minimal_scenario_e2e_test.go
 # gazelle:exclude minimal_builder_e2e_test.go
+# gazelle:exclude minimal_e2e_merge_queue_test.go
 
 # Presubmit tests represent the group of endtoend tests that are run on pull
 # requests and must be passing before a pull request can merge.
@@ -18,6 +19,18 @@ test_suite(
     ],
 )
 
+# Merge queue tests are run when a PR is added to the merge queue. These
+# include comprehensive fork transition tests to ensure all fork upgrades work.
+test_suite(
+    name = "merge_queue",
+    tags = [
+        "manual",
+    ],
+    tests = [
+        ":go_fork_transition_test",
+    ],
+)
+
 # Postsubmit tests represent the group of endtoend tests that are run after a
 # pull request has merged.
 test_suite(
@@ -120,6 +133,40 @@ go_test(
     deps = common_deps,
 )
 
+# Merge queue e2e test. Runs full fork transitions for comprehensive validation.
+# gazelle:ignore
+go_test(
+    name = "go_fork_transition_test",
+    size = "large",
+    testonly = True,
+    srcs = [
+        "component_handler_test.go",
+        "endtoend_setup_test.go",
+        "endtoend_test.go",
+        "minimal_e2e_merge_queue_test.go",
+    ],
+    args = ["-test.v"],
+    data = [
+        "//:prysm_sh",
+        "//cmd/beacon-chain",
+        "//cmd/validator",
+        "//config/params:custom_configs",
+        "//tools/bootnode",
+        "@com_github_ethereum_go_ethereum//cmd/geth",
+        "@web3signer",
+    ],
+    eth_network = "minimal",
+    flaky = True,
+    shard_count = 2,
+    tags = [
+        "e2e",
+        "manual",
+        "minimal",
+        "requires-network",
+    ],
+    deps = common_deps,
+)
+
 # gazelle:ignore
 go_test(
     name = "go_builder_test",

testing/endtoend/minimal_e2e_merge_queue_test.go

@@ -0,0 +1,16 @@
+package endtoend
+
+import (
+	"testing"
+
+	"github.com/OffchainLabs/prysm/v7/config/params"
+	"github.com/OffchainLabs/prysm/v7/runtime/version"
+	"github.com/OffchainLabs/prysm/v7/testing/endtoend/types"
+)
+
+// TestEndToEnd_MinimalConfig_MergeQueue runs a comprehensive e2e test with
+// full fork transitions for merge queue validation.
+func TestEndToEnd_MinimalConfig_MergeQueue(t *testing.T) {
+	r := e2eMinimal(t, types.InitForkCfg(version.Bellatrix, version.Electra, params.E2ETestConfig()), types.WithCheckpointSync())
+	r.run()
+}

testing/endtoend/minimal_e2e_test.go

@@ -8,7 +8,9 @@ import (
 	"github.com/OffchainLabs/prysm/v7/testing/endtoend/types"
 )
 
+// TestEndToEnd_MinimalConfig runs a shorter e2e test for presubmit feedback.
+// Starts from the current fork without fork transitions (8 epochs).
 func TestEndToEnd_MinimalConfig(t *testing.T) {
-	r := e2eMinimal(t, types.InitForkCfg(version.Bellatrix, version.Electra, params.E2ETestConfig()), types.WithCheckpointSync())
+	r := e2eMinimal(t, types.InitForkCfg(version.Electra, version.Electra, params.E2ETestConfig()), types.WithCheckpointSync(), types.WithEpochs(8))
 	r.run()
 }