Fix Broken E2E Runs (#10572)

* fix broken e2e

* hack but works

* make it super ugly

* fix

* fix again

* revert it

* dont make everything exclusive

* gaz

testing/endtoend/BUILD.bazel

@@ -2,6 +2,8 @@ load("@prysm//tools/go:def.bzl", "go_test")
 
 # gazelle:exclude geth_deps.go
 # gazelle:exclude mainnet_e2e_test.go
+# gazelle:exclude multiclient_e2e_test.go
+
 go_test(
     name = "go_default_test",
     size = "large",
@@ -80,6 +82,65 @@ go_test(
     eth_network = "mainnet",
     shard_count = 2,
     tags = [
+        "e2e",
+        "exclusive",
+        "mainnet",
+        "manual",
+        "requires-network",
+    ],
+    deps = [
+        "//beacon-chain/blockchain/testing:go_default_library",
+        "//beacon-chain/core/transition:go_default_library",
+        "//beacon-chain/db/testing:go_default_library",
+        "//beacon-chain/operations/slashings:go_default_library",
+        "//beacon-chain/state/stategen:go_default_library",
+        "//build/bazel:go_default_library",
+        "//config/params:go_default_library",
+        "//crypto/bls:go_default_library",
+        "//proto/prysm/v1alpha1:go_default_library",
+        "//testing/assert:go_default_library",
+        "//testing/endtoend/components:go_default_library",
+        "//testing/endtoend/components/eth1:go_default_library",
+        "//testing/endtoend/evaluators:go_default_library",
+        "//testing/endtoend/helpers:go_default_library",
+        "//testing/endtoend/params:go_default_library",
+        "//testing/endtoend/types:go_default_library",
+        "//testing/require:go_default_library",
+        "//testing/slasher/simulator:go_default_library",
+        "//testing/util:go_default_library",
+        "@com_github_pkg_errors//:go_default_library",
+        "@com_github_prysmaticlabs_eth2_types//:go_default_library",
+        "@com_github_sirupsen_logrus//:go_default_library",
+        "@com_github_sirupsen_logrus//hooks/test:go_default_library",
+        "@org_golang_google_grpc//:go_default_library",
+        "@org_golang_google_protobuf//types/known/emptypb:go_default_library",
+        "@org_golang_x_sync//errgroup:go_default_library",
+    ],
+)
+
+go_test(
+    name = "go_multiclient_test",
+    size = "large",
+    testonly = True,
+    srcs = [
+        "endtoend_test.go",
+        "mainnet_e2e_test.go",
+        "multiclient_e2e_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 = "mainnet",
+    shard_count = 2,
+    tags = [
+        "exclusive",
         "mainnet",
         "manual",
         "multiclient",

testing/endtoend/mainnet_e2e_test.go

@@ -14,14 +14,18 @@ import (
 	"github.com/prysmaticlabs/prysm/testing/require"
 )
 
-func TestEndToEnd_MainnetConfig(t *testing.T) {
-	e2eMainnet(t, false /*usePrysmSh*/)
+// Run mainnet e2e config with the current release validator against latest beacon node.
+func TestEndToEnd_MainnetConfig_ValidatorAtCurrentRelease(t *testing.T) {
+	e2eMainnet(t, true, false)
 }
 
-func e2eMainnet(t *testing.T, usePrysmSh bool) {
+func e2eMainnet(t *testing.T, usePrysmSh, useMultiClient bool) {
 	params.UseE2EMainnetConfig()
-	require.NoError(t, e2eParams.InitMultiClient(e2eParams.StandardBeaconCount, e2eParams.StandardLighthouseNodeCount))
-
+	if useMultiClient {
+		require.NoError(t, e2eParams.InitMultiClient(e2eParams.StandardBeaconCount, e2eParams.StandardLighthouseNodeCount))
+	} else {
+		require.NoError(t, e2eParams.Init(e2eParams.StandardBeaconCount))
+	}
 	// Run for 10 epochs if not in long-running to confirm long-running has no issues.
 	var err error
 	epochsToRun := 10

testing/endtoend/minimal_e2e_test.go

@@ -33,14 +33,6 @@ func TestEndToEnd_MinimalConfig_Web3Signer(t *testing.T) {
 	})
 }
 
-// Run minimal e2e config with the current release validator against latest beacon node.
-func TestEndToEnd_MinimalConfig_ValidatorAtCurrentRelease(t *testing.T) {
-	e2eMinimal(t, &testArgs{
-		usePrysmSh:          true,
-		useWeb3RemoteSigner: false,
-	})
-}
-
 func e2eMinimal(t *testing.T, args *testArgs) {
 	params.UseE2EConfig()
 	require.NoError(t, e2eParams.Init(e2eParams.StandardBeaconCount))

testing/endtoend/multiclient_e2e_test.go

@@ -0,0 +1,9 @@
+package endtoend
+
+import (
+	"testing"
+)
+
+func TestEndToEnd_MainnetConfig_MultiClient(t *testing.T) {
+	e2eMainnet(t, false /*usePrysmSh*/, true /*useMultiClient*/)
+}