Merge cockroachdb#133093

133093: roachtest: update pgjdbc blocklist; fix ruby test setup r=rafiss a=rafiss fixes cockroachdb#132982 fixes cockroachdb#132997 fixes cockroachdb#132826 fixes cockroachdb#132902 fixes cockroachdb#133027 Release note: None Co-authored-by: Rafi Shamim <[email protected]>
cthumuluru-crdb · Oct 22, 2024 · 6ed9876 · 6ed9876
2 parents 2a97d1b + 6c65a35
commit 6ed9876
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 3 deletions.
diff --git a/pkg/cmd/roachtest/tests/activerecord.go b/pkg/cmd/roachtest/tests/activerecord.go
@@ -146,7 +146,7 @@ func registerActiveRecord(r registry.Registry) {
 			c,
 			node,
 			"installing bundler",
-			`cd /mnt/data1/activerecord-cockroachdb-adapter/ && sudo gem install bundler:2.1.4`,
+			`cd /mnt/data1/activerecord-cockroachdb-adapter/ && sudo gem install bundler:2.4.9`,
 		); err != nil {
 			t.Fatal(err)
 		}

diff --git a/pkg/cmd/roachtest/tests/pgjdbc_blocklist.go b/pkg/cmd/roachtest/tests/pgjdbc_blocklist.go
@@ -399,7 +399,6 @@ var pgjdbcBlockList = blocklist{
 	`org.postgresql.test.jdbc2.ServerErrorTest.testNotNullConstraint`:                                                                                               "27796",
 	`org.postgresql.test.jdbc2.ServerErrorTest.testPrimaryKey`:                                                                                                      "27796",
 	`org.postgresql.test.jdbc2.StatementTest.closeInProgressStatement()`:                                                                                            "unknown",
-	`org.postgresql.test.jdbc2.StatementTest.concurrentWarningReadAndClear()`:                                                                                       "unknown",
 	`org.postgresql.test.jdbc2.StatementTest.fastCloses()`:                                                                                                          "unknown",
 	`org.postgresql.test.jdbc2.StatementTest.parsingSemiColons()`:                                                                                                   "unknown",
 	`org.postgresql.test.jdbc2.StatementTest.updateCount()`:                                                                                                         "unknown",

diff --git a/pkg/cmd/roachtest/tests/ruby_pg.go b/pkg/cmd/roachtest/tests/ruby_pg.go
@@ -146,7 +146,7 @@ func registerRubyPG(r registry.Registry) {
 			c,
 			node,
 			"installing bundler",
-			`cd /mnt/data1/ruby-pg/ && sudo gem install bundler:2.1.4`,
+			`cd /mnt/data1/ruby-pg/ && sudo gem install bundler:2.4.9`,
 		); err != nil {
 			t.Fatal(err)
 		}