roachtest: move roachtest

Author: tbg

pkg/cmd/roachtest/tests/BUILD.bazel

@@ -90,6 +90,7 @@ go_library(
         "import_cancellation.go",
         "inconsistency.go",
         "indexes.go",
+        "invariant_check_detection.go",
         "inverted_index.go",
         "jasyncsql.go",
         "jasyncsql_blocklist.go",

pkg/cmd/roachtest/tests/acceptance.go

@@ -11,13 +11,10 @@ import (
 	"time"
 
 	"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/cluster"
-	"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/option"
 	"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/registry"
 	"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/spec"
 	"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/test"
-	"github.com/cockroachdb/cockroach/pkg/roachprod/install"
 	"github.com/cockroachdb/errors"
-	"github.com/stretchr/testify/require"
 )
 
 func registerAcceptance(r registry.Registry) {
@@ -84,22 +81,6 @@ func registerAcceptance(r registry.Registry) {
 				// and version upgrade is impossible to test as of 05/2025.
 				incompatibleClouds: registry.OnlyIBM,
 			},
-			// Tests for maybeSaveClusterDueToInvariantProblems. These don't verify
-			// that everything works as it should, but they can be run to verify
-			// manually that the cluster is saved correctly and the log output is
-			// helpful.
-			{
-				name:    "invariant-check-detection/failed=true",
-				fn:      runInvariantCheckDetectionFailed,
-				timeout: time.Hour,
-				skip:    "manual only",
-			},
-			{
-				name:    "invariant-check-detection/failed=false",
-				fn:      runInvariantCheckDetectionSuccess,
-				timeout: time.Hour,
-				skip:    "manual only",
-			},
 		},
 		registry.OwnerDisasterRecovery: {
 			{
@@ -192,23 +173,3 @@ func registerAcceptance(r registry.Registry) {
 		}
 	}
 }
-
-func runInvariantCheckDetectionFailed(ctx context.Context, t test.Test, c cluster.Cluster) {
-	runInvariantCheckDetection(ctx, t, c, true)
-}
-
-func runInvariantCheckDetectionSuccess(ctx context.Context, t test.Test, c cluster.Cluster) {
-	runInvariantCheckDetection(ctx, t, c, false)
-}
-
-func runInvariantCheckDetection(ctx context.Context, t test.Test, c cluster.Cluster, failed bool) {
-	c.Start(ctx, t.L(), option.DefaultStartOpts(), install.MakeClusterSettings(), c.Range(1, 3))
-	require.NoError(t, c.PutString(ctx, `
-foo br baz
-F250502 11:37:20.387424 1036 raft/raft.go:2411 ⋮ [T1,Vsystem,n1,s1,r155/1:‹/Table/113/1/{43/578…-51/201…}›] 80 match(30115) is out of range [lastIndex(30114)]. Was the raft log corrupted, truncated, or lost?
-asdasds
-`, "logs/foo.log", 0644, c.Node(2)))
-	if failed {
-		t.Error("boom")
-	}
-}

pkg/cmd/roachtest/tests/invariant_check_detection.go

@@ -0,0 +1,51 @@
+// Copyright 2025 The Cockroach Authors.
+//
+// Use of this software is governed by the CockroachDB Software License
+// included in the /LICENSE file.
+
+package tests
+
+import (
+	"context"
+	"fmt"
+
+	"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/cluster"
+	"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/option"
+	"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/registry"
+	"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/spec"
+	"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/test"
+	"github.com/cockroachdb/cockroach/pkg/roachprod/install"
+	"github.com/stretchr/testify/require"
+)
+
+func registerInvariantCheckDetection(r registry.Registry) {
+	// Tests for maybeSaveClusterDueToInvariantProblems. These don't verify
+	// that everything works as it should, but they can be run to verify
+	// manually that the cluster is saved correctly and the log output is
+	// helpful.
+
+	for _, failed := range []bool{false, true} {
+		r.Add(registry.TestSpec{
+			CompatibleClouds: registry.AllClouds,
+			Name:             fmt.Sprintf("invariant-check-detection/failed=%t", failed),
+			Owner:            registry.OwnerTestEng,
+			Suites:           registry.ManualOnly,
+			Cluster:          spec.ClusterSpec{NodeCount: 1, CPUs: 4, ReusePolicy: spec.ReusePolicyNone{}},
+			Run: func(ctx context.Context, t test.Test, c cluster.Cluster) {
+				runInvariantCheckDetection(ctx, t, c, failed)
+			},
+		})
+	}
+}
+
+func runInvariantCheckDetection(ctx context.Context, t test.Test, c cluster.Cluster, failed bool) {
+	c.Start(ctx, t.L(), option.DefaultStartOpts(), install.MakeClusterSettings(), c.Node(1))
+	require.NoError(t, c.PutString(ctx, `
+foo br baz
+F250502 11:37:20.387424 1036 raft/raft.go:2411 ⋮ [T1,Vsystem,n1,s1,r155/1:‹/Table/113/1/{43/578…-51/201…}›] 80 match(30115) is out of range [lastIndex(30114)]. Was the raft log corrupted, truncated, or lost?
+asdasds
+`, "logs/foo.log", 0644, c.Node(1)))
+	if failed {
+		t.Error("boom")
+	}
+}

pkg/cmd/roachtest/tests/registry.go

@@ -77,6 +77,7 @@ func RegisterTests(r registry.Registry) {
 	registerImportTPCH(r)
 	registerInconsistency(r)
 	registerIndexes(r)
+	registerInvariantCheckDetection(r)
 	registerJasyncSQL(r)
 	registerJepsen(r)
 	registerJobs(r)