Merge cockroachdb#116478 cockroachdb#116546

116478: bazel: tag `integration` tests as `no-remote-exec` r=rail a=rickystewart Epic: CRDB-8308 Release note: None 116546: kvserver,stats: skip a couple tests under `race` r=rail a=rickystewart Epic: CRDB-8308 Release note: None Co-authored-by: Ricky Stewart <ricky@cockroachlabs.com>
pav-kv · Dec 15, 2023 · a4b8a4c · a4b8a4c
3 parents 138f2eb + 17b592e + 99884f8
commit a4b8a4c
Show file tree

Hide file tree

Showing 8 changed files with 26 additions and 6 deletions.
diff --git a/pkg/acceptance/BUILD.bazel b/pkg/acceptance/BUILD.bazel
@@ -54,7 +54,10 @@ go_test(
     exec_properties = {"Pool": "large"},
     gotags = ["acceptance"],
     shard_count = 16,
-    tags = ["integration"],
+    tags = [
+        "integration",
+        "no-remote-exec",
+    ],
     deps = [
         "//pkg/acceptance/cluster",
         "//pkg/build/bazel",

diff --git a/pkg/compose/BUILD.bazel b/pkg/compose/BUILD.bazel
@@ -18,7 +18,10 @@ go_test(
     embed = [":compose"],
     exec_properties = {"Pool": "large"},
     gotags = ["compose"],
-    tags = ["integration"],
+    tags = [
+        "integration",
+        "no-remote-exec",
+    ],
     deps = [
         "//pkg/build/bazel",
         "//pkg/util/envutil",

diff --git a/pkg/compose/compare/compare/BUILD.bazel b/pkg/compose/compare/compare/BUILD.bazel
@@ -12,7 +12,10 @@ go_test(
     srcs = ["compare_test.go"],
     embed = [":compare"],
     gotags = ["compose"],
-    tags = ["integration"],
+    tags = [
+        "integration",
+        "no-remote-exec",
+    ],
     visibility = ["//pkg/compose:__subpackages__"],
     deps = [
         "//pkg/cmd/cmpconn",

diff --git a/pkg/kv/kvserver/replica_learner_test.go b/pkg/kv/kvserver/replica_learner_test.go
@@ -1367,6 +1367,9 @@ func TestReplicaGCQueueSeesLearnerOrJointConfig(t *testing.T) {
 func TestRaftSnapshotQueueSeesLearner(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
+
+	skip.UnderRace(t, "probable OOM")
+
 	ctx := context.Background()
 	blockSnapshotsCh := make(chan struct{})
 	knobs, ltk := makeReplicationTestKnobs()

diff --git a/pkg/sql/schemachanger/corpus/BUILD.bazel b/pkg/sql/schemachanger/corpus/BUILD.bazel
@@ -4,7 +4,6 @@ go_library(
     name = "corpus",
     srcs = ["corpus.go"],
     importpath = "github.com/cockroachdb/cockroach/pkg/sql/schemachanger/corpus",
-    tags = ["integration"],
     visibility = ["//visibility:public"],
     deps = [
         "//pkg/sql/schemachanger/scop",

diff --git a/pkg/sql/stats/stats_cache_test.go b/pkg/sql/stats/stats_cache_test.go
@@ -30,6 +30,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/sql/types"
 	"github.com/cockroachdb/cockroach/pkg/testutils"
 	"github.com/cockroachdb/cockroach/pkg/testutils/serverutils"
+	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
 	"github.com/cockroachdb/cockroach/pkg/util/encoding"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
@@ -435,6 +436,8 @@ func TestCacheAutoRefresh(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.UnderRace(t, "probable OOM")
+
 	ctx := context.Background()
 	tc := serverutils.StartCluster(t, 3 /* numNodes */, base.TestClusterArgs{})
 	defer tc.Stopper().Stop(ctx)

diff --git a/pkg/testutils/docker/BUILD.bazel b/pkg/testutils/docker/BUILD.bazel
@@ -9,7 +9,10 @@ go_test(
         "//pkg/testutils/docker/docker-fsnotify",
     ],
     gotags = ["docker"],
-    tags = ["integration"],
+    tags = [
+        "integration",
+        "no-remote-exec",
+    ],
     deps = [
         "//pkg/util/ctxlog",
         "//pkg/util/log",

diff --git a/pkg/testutils/lint/BUILD.bazel b/pkg/testutils/lint/BUILD.bazel
@@ -25,7 +25,10 @@ go_test(
     embed = [":lint"],
     embedsrcs = ["gcassert_paths.txt"],
     gotags = ["lint"],
-    tags = ["integration"],
+    tags = [
+        "integration",
+        "no-remote-exec",
+    ],
     visibility = ["//build/bazelutil:__subpackages__"],
     deps = [
         "//pkg/build/bazel",