Skip to content

Commit 33387d5

Browse files
authored
Merge pull request #156908 from fqazi/blathers/backport-release-25.4-156893
release-25.4: roachtest/activerecord: skip FIPS architecture
2 parents e7f20b6 + ac9498e commit 33387d5

File tree

1 file changed

+2
-1
lines changed

1 file changed

+2
-1
lines changed

pkg/cmd/roachtest/tests/activerecord.go

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,7 @@ import (
1616
"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/cluster"
1717
"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/option"
1818
"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/registry"
19+
"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/spec"
1920
"github.com/cockroachdb/cockroach/pkg/cmd/roachtest/test"
2021
"github.com/cockroachdb/cockroach/pkg/roachprod/config"
2122
rperrors "github.com/cockroachdb/cockroach/pkg/roachprod/errors"
@@ -245,7 +246,7 @@ func registerActiveRecord(r registry.Registry) {
245246
Name: "activerecord",
246247
Owner: registry.OwnerSQLFoundations,
247248
Timeout: 5 * time.Hour,
248-
Cluster: r.MakeClusterSpec(1),
249+
Cluster: r.MakeClusterSpec(1, spec.Arch(spec.AllExceptFIPS)),
249250
NativeLibs: registry.LibGEOS,
250251
CompatibleClouds: registry.OnlyGCE,
251252
Suites: registry.Suites(registry.Nightly, registry.ORM),

0 commit comments

Comments
 (0)