Merge pull request #159849 from kev-cao/blathers/backport-release-26.1-159631

release-26.1: backup: deflake ResolveDestination test under race

Author: kev-cao

pkg/backup/backupdest/BUILD.bazel

@@ -66,6 +66,7 @@ go_test(
         "//pkg/sql",
         "//pkg/testutils/jobutils",
         "//pkg/testutils/serverutils",
+        "//pkg/testutils/skip",
         "//pkg/testutils/testcluster",
         "//pkg/util",
         "//pkg/util/hlc",

pkg/backup/backupdest/backup_destination_test.go

@@ -24,6 +24,7 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/security/username"
 	"github.com/cockroachdb/cockroach/pkg/sql"
 	"github.com/cockroachdb/cockroach/pkg/testutils/jobutils"
+	"github.com/cockroachdb/cockroach/pkg/testutils/skip"
 	"github.com/cockroachdb/cockroach/pkg/util"
 	"github.com/cockroachdb/cockroach/pkg/util/hlc"
 	"github.com/cockroachdb/cockroach/pkg/util/leaktest"
@@ -38,6 +39,8 @@ func TestBackupRestoreResolveDestination(t *testing.T) {
 	defer leaktest.AfterTest(t)()
 	defer log.Scope(t).Close(t)
 
+	skip.UnderRace(t, "multinode clusters are slow under race")
+
 	var params base.TestClusterArgs
 	params.ServerArgs.DefaultDRPCOption = base.TestDRPCDisabled