Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release-22.2: roachtest: skip roachtests needing old releases on ARM64 #89789

Merged
merged 1 commit into from
Oct 13, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/cmd/roachtest/tests/autoupgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ package tests
import (
"context"
"fmt"
"runtime"
"time"

"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/cluster"
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions pkg/cmd/roachtest/tests/backup.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import (
"net/url"
"os"
"path/filepath"
"runtime"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -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 = ""
Expand Down
4 changes: 4 additions & 0 deletions pkg/cmd/roachtest/tests/decommission.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"math/rand"
"reflect"
"regexp"
"runtime"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -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())
},
})
Expand Down
4 changes: 4 additions & 0 deletions pkg/cmd/roachtest/tests/fixtures.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ package tests

import (
"context"
"runtime"
"strings"
"time"

Expand Down Expand Up @@ -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)
}
Expand Down
4 changes: 4 additions & 0 deletions pkg/cmd/roachtest/tests/follower_reads.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"net/http"
"reflect"
"regexp"
"runtime"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -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())
},
})
Expand Down
4 changes: 4 additions & 0 deletions pkg/cmd/roachtest/tests/import.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
gosql "database/sql"
"fmt"
"path/filepath"
"runtime"
"strings"
"time"

Expand Down Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions pkg/cmd/roachtest/tests/mixed_version_cdc.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"context"
gosql "database/sql"
"fmt"
"runtime"
"strconv"
"strings"
"time"
Expand Down Expand Up @@ -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())
},
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import (
"os"
"path/filepath"
"regexp"
"runtime"
"strings"

"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/cluster"
Expand All @@ -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())
},
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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 = ""
Expand Down
4 changes: 4 additions & 0 deletions pkg/cmd/roachtest/tests/mixed_version_jobs.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ package tests
import (
"context"
"fmt"
"runtime"
"time"

"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/cluster"
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions pkg/cmd/roachtest/tests/mixed_version_schemachange.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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() {
Expand Down
4 changes: 4 additions & 0 deletions pkg/cmd/roachtest/tests/multitenant_upgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ package tests
import (
"context"
gosql "database/sql"
"runtime"
"time"

"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/cluster"
Expand All @@ -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())
},
})
Expand Down
4 changes: 4 additions & 0 deletions pkg/cmd/roachtest/tests/rebalance_load.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
gosql "database/sql"
"fmt"
"math/rand"
"runtime"
"sort"
"strings"
"time"
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions pkg/cmd/roachtest/tests/secondary_indexes.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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)
Expand Down
4 changes: 4 additions & 0 deletions pkg/cmd/roachtest/tests/tpcc.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ import (
"math/rand"
"os"
"path/filepath"
"runtime"
"strings"
"time"

Expand Down Expand Up @@ -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)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@ package tests

import (
"context"
"runtime"
"strings"

"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/cluster"
Expand All @@ -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 {
Expand Down
4 changes: 4 additions & 0 deletions pkg/cmd/roachtest/tests/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ package tests
import (
"context"
"fmt"
"runtime"
"strings"
"time"

Expand Down Expand Up @@ -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)
Expand Down
3 changes: 3 additions & 0 deletions pkg/cmd/roachtest/tests/versionupgrade.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down