Merge #77136 #77165

77136: ccl/sqlproxyccl: bump size of `tenant` test r=rail a=rickystewart Release justification: non-production code changes Release note: None 77165: activerecord: bump version r=rafiss a=otan Contains smarter versioning which hopefully fixes this interval style issue which I think has to do with versioning. Release justification: test only change Release note: None Resolves #77121 Co-authored-by: Ricky Stewart <[email protected]> Co-authored-by: Oliver Tan <[email protected]>
cockroachdb · Feb 28, 2022 · 306172e · 306172e
3 parents 94c7313 + 7554b1f + d1287bf
commit 306172e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/pkg/ccl/sqlproxyccl/tenant/BUILD.bazel b/pkg/ccl/sqlproxyccl/tenant/BUILD.bazel
@@ -45,6 +45,7 @@ go_library(
 
 go_test(
     name = "tenant_test",
+    size = "large",
     srcs = [
         "directory_test.go",
         "main_test.go",

diff --git a/pkg/cmd/roachtest/tests/activerecord.go b/pkg/cmd/roachtest/tests/activerecord.go
@@ -28,7 +28,7 @@ import (
 var activerecordResultRegex = regexp.MustCompile(`^(?P<test>[^\s]+#[^\s]+) = (?P<timing>\d+\.\d+ s) = (?P<result>.)$`)
 var railsReleaseTagRegex = regexp.MustCompile(`^v(?P<major>\d+)\.(?P<minor>\d+)\.(?P<point>\d+)\.?(?P<subpoint>\d*)$`)
 var supportedRailsVersion = "6.1"
-var activerecordAdapterVersion = "v6.1.5"
+var activerecordAdapterVersion = "v6.1.6"
 
 // This test runs activerecord's full test suite against a single cockroach node.