From adbe0c9c38441eac39d22324580cb24dcf0a56c2 Mon Sep 17 00:00:00 2001 From: healthy-pod Date: Mon, 3 Oct 2022 17:57:46 +0000 Subject: [PATCH] roachtest: skip roachtests needing old releases on ARM64 This code change skips some roachtests on ARM64 because we do not have enough ARM64 releases to run them. Release note: None --- pkg/cmd/roachtest/tests/autoupgrade.go | 4 ++++ pkg/cmd/roachtest/tests/backup.go | 4 ++++ pkg/cmd/roachtest/tests/decommission.go | 4 ++++ pkg/cmd/roachtest/tests/fixtures.go | 4 ++++ pkg/cmd/roachtest/tests/follower_reads.go | 4 ++++ pkg/cmd/roachtest/tests/import.go | 4 ++++ pkg/cmd/roachtest/tests/mixed_version_cdc.go | 4 ++++ .../roachtest/tests/mixed_version_decl_schemachange_compat.go | 4 ++++ ...version_job_compatibility_in_declarative_schema_changer.go | 4 ++++ pkg/cmd/roachtest/tests/mixed_version_jobs.go | 4 ++++ pkg/cmd/roachtest/tests/mixed_version_schemachange.go | 4 ++++ pkg/cmd/roachtest/tests/multitenant_upgrade.go | 4 ++++ pkg/cmd/roachtest/tests/rebalance_load.go | 4 ++++ pkg/cmd/roachtest/tests/secondary_indexes.go | 4 ++++ pkg/cmd/roachtest/tests/tpcc.go | 4 ++++ .../tests/validate_system_schema_after_version_upgrade.go | 4 ++++ pkg/cmd/roachtest/tests/version.go | 4 ++++ pkg/cmd/roachtest/tests/versionupgrade.go | 3 +++ 18 files changed, 71 insertions(+) diff --git a/pkg/cmd/roachtest/tests/autoupgrade.go b/pkg/cmd/roachtest/tests/autoupgrade.go index f74fa1413129..88b308b10ae2 100644 --- a/pkg/cmd/roachtest/tests/autoupgrade.go +++ b/pkg/cmd/roachtest/tests/autoupgrade.go @@ -13,6 +13,7 @@ package tests import ( "context" "fmt" + "runtime" "time" "github.com/cockroachdb/cockroach/pkg/cmd/roachtest/cluster" @@ -255,6 +256,9 @@ func registerAutoUpgrade(r registry.Registry) { Owner: registry.OwnerKV, Cluster: r.MakeClusterSpec(5), Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { + if runtime.GOARCH == "arm64" { + t.Skip("Skip under ARM64. See https://github.com/cockroachdb/cockroach/issues/89268") + } pred, err := PredecessorVersion(*t.BuildVersion()) if err != nil { t.Fatal(err) diff --git a/pkg/cmd/roachtest/tests/backup.go b/pkg/cmd/roachtest/tests/backup.go index 3c426ff18980..4338246ab822 100644 --- a/pkg/cmd/roachtest/tests/backup.go +++ b/pkg/cmd/roachtest/tests/backup.go @@ -20,6 +20,7 @@ import ( "net/url" "os" "path/filepath" + "runtime" "strconv" "strings" "time" @@ -443,6 +444,9 @@ func registerBackupMixedVersion(r registry.Registry) { EncryptionSupport: registry.EncryptionMetamorphic, RequiresLicense: true, Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { + if runtime.GOARCH == "arm64" { + t.Skip("Skip under ARM64. See https://github.com/cockroachdb/cockroach/issues/89268") + } // An empty string means that the cockroach binary specified by flag // `cockroach` will be used. const mainVersion = "" diff --git a/pkg/cmd/roachtest/tests/decommission.go b/pkg/cmd/roachtest/tests/decommission.go index 86488fe534df..bf49ae32e11f 100644 --- a/pkg/cmd/roachtest/tests/decommission.go +++ b/pkg/cmd/roachtest/tests/decommission.go @@ -17,6 +17,7 @@ import ( "math/rand" "reflect" "regexp" + "runtime" "strconv" "strings" "time" @@ -97,6 +98,9 @@ func registerDecommission(r registry.Registry) { Owner: registry.OwnerKV, Cluster: r.MakeClusterSpec(numNodes), Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { + if runtime.GOARCH == "arm64" { + t.Skip("Skip under ARM64. See https://github.com/cockroachdb/cockroach/issues/89268") + } runDecommissionMixedVersions(ctx, t, c, *t.BuildVersion()) }, }) diff --git a/pkg/cmd/roachtest/tests/fixtures.go b/pkg/cmd/roachtest/tests/fixtures.go index a55e4360f26d..f0f267ba821d 100644 --- a/pkg/cmd/roachtest/tests/fixtures.go +++ b/pkg/cmd/roachtest/tests/fixtures.go @@ -12,6 +12,7 @@ package tests import ( "context" + "runtime" "strings" "time" @@ -55,6 +56,9 @@ func registerFixtures(r registry.Registry) { t test.Test, c cluster.Cluster, ) { + if runtime.GOARCH == "arm64" { + t.Skip("Skip under ARM64. See https://github.com/cockroachdb/cockroach/issues/89268") + } fixtureVersion := strings.TrimPrefix(t.BuildVersion().String(), "v") makeVersionFixtureAndFatal(ctx, t, c, fixtureVersion) } diff --git a/pkg/cmd/roachtest/tests/follower_reads.go b/pkg/cmd/roachtest/tests/follower_reads.go index af4bb9a1fd2f..d53d9e5d2a4e 100644 --- a/pkg/cmd/roachtest/tests/follower_reads.go +++ b/pkg/cmd/roachtest/tests/follower_reads.go @@ -19,6 +19,7 @@ import ( "net/http" "reflect" "regexp" + "runtime" "strconv" "strings" "time" @@ -99,6 +100,9 @@ func registerFollowerReads(r registry.Registry) { spec.CPU(2), ), Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { + if runtime.GOARCH == "arm64" { + t.Skip("Skip under ARM64. See https://github.com/cockroachdb/cockroach/issues/89268") + } runFollowerReadsMixedVersionSingleRegionTest(ctx, t, c, *t.BuildVersion()) }, }) diff --git a/pkg/cmd/roachtest/tests/import.go b/pkg/cmd/roachtest/tests/import.go index 96ac0a929a5a..45f4b219d43b 100644 --- a/pkg/cmd/roachtest/tests/import.go +++ b/pkg/cmd/roachtest/tests/import.go @@ -15,6 +15,7 @@ import ( gosql "database/sql" "fmt" "path/filepath" + "runtime" "strings" "time" @@ -352,6 +353,9 @@ func registerImportMixedVersion(r registry.Registry) { // Mixed-version support was added in 21.1. Cluster: r.MakeClusterSpec(4), Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { + if runtime.GOARCH == "arm64" { + t.Skip("Skip under ARM64. See https://github.com/cockroachdb/cockroach/issues/89268") + } predV, err := PredecessorVersion(*t.BuildVersion()) if err != nil { t.Fatal(err) diff --git a/pkg/cmd/roachtest/tests/mixed_version_cdc.go b/pkg/cmd/roachtest/tests/mixed_version_cdc.go index 29c9c774c20c..13a919e2b132 100644 --- a/pkg/cmd/roachtest/tests/mixed_version_cdc.go +++ b/pkg/cmd/roachtest/tests/mixed_version_cdc.go @@ -14,6 +14,7 @@ import ( "context" gosql "database/sql" "fmt" + "runtime" "strconv" "strings" "time" @@ -65,6 +66,9 @@ func registerCDCMixedVersions(r registry.Registry) { Timeout: timeout, RequiresLicense: true, Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { + if runtime.GOARCH == "arm64" { + t.Skip("Skip under ARM64. See https://github.com/cockroachdb/cockroach/issues/89268") + } runCDCMixedVersions(ctx, t, c, *t.BuildVersion()) }, }) diff --git a/pkg/cmd/roachtest/tests/mixed_version_decl_schemachange_compat.go b/pkg/cmd/roachtest/tests/mixed_version_decl_schemachange_compat.go index 96488205bf22..c365db5e3652 100644 --- a/pkg/cmd/roachtest/tests/mixed_version_decl_schemachange_compat.go +++ b/pkg/cmd/roachtest/tests/mixed_version_decl_schemachange_compat.go @@ -16,6 +16,7 @@ import ( "os" "path/filepath" "regexp" + "runtime" "strings" "github.com/cockroachdb/cockroach/pkg/cmd/roachtest/cluster" @@ -30,6 +31,9 @@ func registerDeclSchemaChangeCompatMixedVersions(r registry.Registry) { Owner: registry.OwnerSQLSchema, Cluster: r.MakeClusterSpec(1), Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { + if runtime.GOARCH == "arm64" { + t.Skip("Skip under ARM64. See https://github.com/cockroachdb/cockroach/issues/89268") + } runDeclSchemaChangeCompatMixedVersions(ctx, t, c, *t.BuildVersion()) }, }) diff --git a/pkg/cmd/roachtest/tests/mixed_version_job_compatibility_in_declarative_schema_changer.go b/pkg/cmd/roachtest/tests/mixed_version_job_compatibility_in_declarative_schema_changer.go index 6752c0d8a96d..a594823f85c9 100644 --- a/pkg/cmd/roachtest/tests/mixed_version_job_compatibility_in_declarative_schema_changer.go +++ b/pkg/cmd/roachtest/tests/mixed_version_job_compatibility_in_declarative_schema_changer.go @@ -12,6 +12,7 @@ package tests import ( "context" + "runtime" "github.com/cockroachdb/cockroach/pkg/cmd/roachtest/cluster" "github.com/cockroachdb/cockroach/pkg/cmd/roachtest/option" @@ -83,6 +84,9 @@ func registerDeclarativeSchemaChangerJobCompatibilityInMixedVersion(r registry.R Owner: registry.OwnerSQLSchema, Cluster: r.MakeClusterSpec(4), Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { + if runtime.GOARCH == "arm64" { + t.Skip("Skip under ARM64. See https://github.com/cockroachdb/cockroach/issues/89268") + } // An empty string means that the cockroach binary specified by flag // `cockroach` will be used. const mainVersion = "" diff --git a/pkg/cmd/roachtest/tests/mixed_version_jobs.go b/pkg/cmd/roachtest/tests/mixed_version_jobs.go index 7438ddab8a85..8ce47cf51c0d 100644 --- a/pkg/cmd/roachtest/tests/mixed_version_jobs.go +++ b/pkg/cmd/roachtest/tests/mixed_version_jobs.go @@ -13,6 +13,7 @@ package tests import ( "context" "fmt" + "runtime" "time" "github.com/cockroachdb/cockroach/pkg/cmd/roachtest/cluster" @@ -333,6 +334,9 @@ func registerJobsMixedVersions(r registry.Registry) { // vice versa in order to detect regressions in the work done for 20.1. Cluster: r.MakeClusterSpec(4), Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { + if runtime.GOARCH == "arm64" { + t.Skip("Skip under ARM64. See https://github.com/cockroachdb/cockroach/issues/89268") + } predV, err := PredecessorVersion(*t.BuildVersion()) if err != nil { t.Fatal(err) diff --git a/pkg/cmd/roachtest/tests/mixed_version_schemachange.go b/pkg/cmd/roachtest/tests/mixed_version_schemachange.go index 63ba5cb8fae7..75ef44ee7d14 100644 --- a/pkg/cmd/roachtest/tests/mixed_version_schemachange.go +++ b/pkg/cmd/roachtest/tests/mixed_version_schemachange.go @@ -13,6 +13,7 @@ package tests import ( "context" "fmt" + "runtime" "github.com/cockroachdb/cockroach/pkg/cmd/roachtest/cluster" "github.com/cockroachdb/cockroach/pkg/cmd/roachtest/registry" @@ -30,6 +31,9 @@ func registerSchemaChangeMixedVersions(r registry.Registry) { Cluster: r.MakeClusterSpec(4), NativeLibs: registry.LibGEOS, Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { + if runtime.GOARCH == "arm64" { + t.Skip("Skip under ARM64. See https://github.com/cockroachdb/cockroach/issues/89268") + } maxOps := 100 concurrency := 5 if c.IsLocal() { diff --git a/pkg/cmd/roachtest/tests/multitenant_upgrade.go b/pkg/cmd/roachtest/tests/multitenant_upgrade.go index 887cac8ea208..57d26d5177e5 100644 --- a/pkg/cmd/roachtest/tests/multitenant_upgrade.go +++ b/pkg/cmd/roachtest/tests/multitenant_upgrade.go @@ -13,6 +13,7 @@ package tests import ( "context" gosql "database/sql" + "runtime" "time" "github.com/cockroachdb/cockroach/pkg/cmd/roachtest/cluster" @@ -32,6 +33,9 @@ func registerMultiTenantUpgrade(r registry.Registry) { Owner: registry.OwnerMultiTenant, NonReleaseBlocker: false, Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { + if runtime.GOARCH == "arm64" { + t.Skip("Skip under ARM64. See https://github.com/cockroachdb/cockroach/issues/89268") + } runMultiTenantUpgrade(ctx, t, c, *t.BuildVersion()) }, }) diff --git a/pkg/cmd/roachtest/tests/rebalance_load.go b/pkg/cmd/roachtest/tests/rebalance_load.go index 81485336de6e..d3223a0000d2 100644 --- a/pkg/cmd/roachtest/tests/rebalance_load.go +++ b/pkg/cmd/roachtest/tests/rebalance_load.go @@ -15,6 +15,7 @@ import ( gosql "database/sql" "fmt" "math/rand" + "runtime" "sort" "strings" "time" @@ -156,6 +157,9 @@ func registerRebalanceLoad(r registry.Registry) { Owner: registry.OwnerKV, Cluster: r.MakeClusterSpec(4), // the last node is just used to generate load Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { + if runtime.GOARCH == "arm64" { + t.Skip("Skip under ARM64. See https://github.com/cockroachdb/cockroach/issues/89268") + } if c.IsLocal() { concurrency = 32 fmt.Printf("lowering concurrency to %d in local testing\n", concurrency) diff --git a/pkg/cmd/roachtest/tests/secondary_indexes.go b/pkg/cmd/roachtest/tests/secondary_indexes.go index ee48dc30d9b4..75a3b80f0527 100644 --- a/pkg/cmd/roachtest/tests/secondary_indexes.go +++ b/pkg/cmd/roachtest/tests/secondary_indexes.go @@ -12,6 +12,7 @@ package tests import ( "context" + "runtime" "github.com/cockroachdb/cockroach/pkg/cmd/roachtest/cluster" "github.com/cockroachdb/cockroach/pkg/cmd/roachtest/registry" @@ -140,6 +141,9 @@ func registerSecondaryIndexesMultiVersionCluster(r registry.Registry) { Owner: registry.OwnerSQLSchema, Cluster: r.MakeClusterSpec(3), Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { + if runtime.GOARCH == "arm64" { + t.Skip("Skip under ARM64. See https://github.com/cockroachdb/cockroach/issues/89268") + } predV, err := PredecessorVersion(*t.BuildVersion()) if err != nil { t.Fatal(err) diff --git a/pkg/cmd/roachtest/tests/tpcc.go b/pkg/cmd/roachtest/tests/tpcc.go index 799577dfb795..2ec0f38cdcf1 100644 --- a/pkg/cmd/roachtest/tests/tpcc.go +++ b/pkg/cmd/roachtest/tests/tpcc.go @@ -17,6 +17,7 @@ import ( "math/rand" "os" "path/filepath" + "runtime" "strings" "time" @@ -358,6 +359,9 @@ func registerTPCC(r registry.Registry) { Cluster: mixedHeadroomSpec, EncryptionSupport: registry.EncryptionMetamorphic, Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { + if runtime.GOARCH == "arm64" { + t.Skip("Skip under ARM64. See https://github.com/cockroachdb/cockroach/issues/89268") + } crdbNodes := c.Range(1, 4) workloadNode := c.Node(5) diff --git a/pkg/cmd/roachtest/tests/validate_system_schema_after_version_upgrade.go b/pkg/cmd/roachtest/tests/validate_system_schema_after_version_upgrade.go index f33de73db005..89b73e0cca12 100644 --- a/pkg/cmd/roachtest/tests/validate_system_schema_after_version_upgrade.go +++ b/pkg/cmd/roachtest/tests/validate_system_schema_after_version_upgrade.go @@ -12,6 +12,7 @@ package tests import ( "context" + "runtime" "strings" "github.com/cockroachdb/cockroach/pkg/cmd/roachtest/cluster" @@ -32,6 +33,9 @@ func registerValidateSystemSchemaAfterVersionUpgrade(r registry.Registry) { Owner: registry.OwnerSQLSchema, Cluster: r.MakeClusterSpec(1), Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { + if runtime.GOARCH == "arm64" { + t.Skip("Skip under ARM64. See https://github.com/cockroachdb/cockroach/issues/89268") + } const mainVersion = "" predecessorVersion, err := PredecessorVersion(*t.BuildVersion()) if err != nil { diff --git a/pkg/cmd/roachtest/tests/version.go b/pkg/cmd/roachtest/tests/version.go index 5fa1cca59d3c..63b307a91264 100644 --- a/pkg/cmd/roachtest/tests/version.go +++ b/pkg/cmd/roachtest/tests/version.go @@ -13,6 +13,7 @@ package tests import ( "context" "fmt" + "runtime" "strings" "time" @@ -220,6 +221,9 @@ func registerVersion(r registry.Registry) { Owner: registry.OwnerTestEng, Cluster: r.MakeClusterSpec(n + 1), Run: func(ctx context.Context, t test.Test, c cluster.Cluster) { + if runtime.GOARCH == "arm64" { + t.Skip("Skip under ARM64. See https://github.com/cockroachdb/cockroach/issues/89268") + } pred, err := PredecessorVersion(*t.BuildVersion()) if err != nil { t.Fatal(err) diff --git a/pkg/cmd/roachtest/tests/versionupgrade.go b/pkg/cmd/roachtest/tests/versionupgrade.go index 0156d4268b02..b2e00f245049 100644 --- a/pkg/cmd/roachtest/tests/versionupgrade.go +++ b/pkg/cmd/roachtest/tests/versionupgrade.go @@ -88,6 +88,9 @@ drop table splitmerge.t; } func runVersionUpgrade(ctx context.Context, t test.Test, c cluster.Cluster) { + if runtime.GOARCH == "arm64" { + t.Skip("Skip under ARM64. See https://github.com/cockroachdb/cockroach/issues/89268") + } predecessorVersion, err := PredecessorVersion(*t.BuildVersion()) if err != nil { t.Fatal(err)