Merge pull request #139889 from cockroachdb/blathers/backport-release-25.1-139879

release-25.1: roachtest: skip online restore tests on released versions

Author: msbutler

pkg/backup/backuptestutils/BUILD.bazel

@@ -9,6 +9,7 @@ go_library(
     deps = [
         "//pkg/backup/backupbase",
         "//pkg/base",
+        "//pkg/clusterversion",
         "//pkg/jobs",
         "//pkg/keyvisualizer",
         "//pkg/kv/kvserver",

pkg/backup/backuptestutils/testutils.go

@@ -14,6 +14,7 @@ import (
 
 	_ "github.com/cockroachdb/cockroach/pkg/backup/backupbase" // imported for cluster settings.
 	"github.com/cockroachdb/cockroach/pkg/base"
+	"github.com/cockroachdb/cockroach/pkg/clusterversion"
 	"github.com/cockroachdb/cockroach/pkg/jobs"
 	"github.com/cockroachdb/cockroach/pkg/keyvisualizer"
 	"github.com/cockroachdb/cockroach/pkg/kv/kvserver"
@@ -31,6 +32,11 @@ import (
 	"github.com/stretchr/testify/require"
 )
 
+func IsOnlineRestoreSupported() bool {
+	// TODO(jeffswenson): relax this check once online restore is in preview.
+	return clusterversion.DevelopmentBranch
+}
+
 const (
 	// SingleNode is the size of a single node test cluster.
 	SingleNode = 1

pkg/cmd/roachtest/tests/BUILD.bazel

@@ -206,6 +206,7 @@ go_library(
     importpath = "github.com/cockroachdb/cockroach/pkg/cmd/roachtest/tests",
     visibility = ["//visibility:public"],
     deps = [
+        "//pkg/backup/backuptestutils",
         "//pkg/base",
         "//pkg/blobs",
         "//pkg/ccl/changefeedccl",

pkg/cmd/roachtest/tests/online_restore.go

@@ -12,6 +12,7 @@ import (
 	"strings"
 	"time"
 
+	"github.com/cockroachdb/cockroach/pkg/backup/backuptestutils"
 	"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/cluster"
 	"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/clusterstats"
 	"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/option"
@@ -133,6 +134,10 @@ func registerOnlineRestorePerf(r registry.Registry) {
 						sp.namePrefix = sp.namePrefix + fmt.Sprintf("/workarounds=%t", useWorkarounds)
 					}
 
+					if sp.skip == "" && !backuptestutils.IsOnlineRestoreSupported() {
+						sp.skip = "online restore is only tested on development branch"
+					}
+
 					sp.initTestName()
 					r.Add(registry.TestSpec{
 						Name:      sp.testName,