Merge #120844 #120849

120844: workflows: run `examples-orms` on non-FIPS machines r=rail a=rickystewart This was an accident. Epic: CRDB-8308 Release note: None 120849: roachtest: update pgjdbc blocklist r=yuzefovich a=yuzefovich Two tests now pass. Also record two known failures tracked by 119937 as expected (I'm looking into them but we might need to accept these failures as expected, tbd). Addresses: #119937. Epic: None Release note: None Co-authored-by: Ricky Stewart <[email protected]> Co-authored-by: Yahor Yuzefovich <[email protected]>
cockroachdb · Mar 21, 2024 · d8c1276 · d8c1276
3 parents fc6f874 + b4fdae8 + 1199127
commit d8c1276
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/github-actions-essential-ci.yml b/.github/workflows/github-actions-essential-ci.yml
@@ -83,7 +83,7 @@ jobs:
         run: ./build/github/cleanup-engflow-keys.sh
         if: always()
   examples_orms:
-    runs-on: [self-hosted, basic_big_runner_group_fips]
+    runs-on: [self-hosted, basic_big_runner_group]
     steps:
       - uses: actions/checkout@v4
         with:

diff --git a/pkg/cmd/roachtest/tests/pgjdbc_blocklist.go b/pkg/cmd/roachtest/tests/pgjdbc_blocklist.go
@@ -487,8 +487,10 @@ var pgjdbcBlockList = blocklist{
 	`org.postgresql.test.jdbc3.CompositeTest.testSimpleSelect`:                                                                                                                 "27793",
 	`org.postgresql.test.jdbc3.CompositeTest.testTableMetadata`:                                                                                                                "27793",
 	`org.postgresql.test.jdbc3.DatabaseMetaDataTest.testGetColumnsForDomain`:                                                                                                   "27796",
+	`org.postgresql.test.jdbc3.EscapeSyntaxCallModeCallIfNoReturnTest.testInvokeFunction`:                                                                                      "119937",
 	`org.postgresql.test.jdbc3.EscapeSyntaxCallModeCallIfNoReturnTest.testInvokeFunctionHavingReturnParameter`:                                                                 "17511",
 	`org.postgresql.test.jdbc3.EscapeSyntaxCallModeCallIfNoReturnTest.testInvokeProcedure`:                                                                                     "17511",
+	`org.postgresql.test.jdbc3.EscapeSyntaxCallModeCallTest.testInvokeFunction`:                                                                                                "119937",
 	`org.postgresql.test.jdbc3.EscapeSyntaxCallModeCallTest.testInvokeFunctionHavingReturnParameter`:                                                                           "17511",
 	`org.postgresql.test.jdbc3.EscapeSyntaxCallModeCallTest.testInvokeProcedure`:                                                                                               "17511",
 	`org.postgresql.test.jdbc3.EscapeSyntaxCallModeSelectTest.testInvokeFunction`:                                                                                              "17511",
@@ -542,10 +544,8 @@ var pgjdbcBlockList = blocklist{
 	`org.postgresql.test.jdbc3.ParameterMetaDataTest.testMultiStatement`:                                                                                                       "21286",
 	`org.postgresql.test.jdbc3.ParameterMetaDataTest.testParameterMD`:                                                                                                          "21286",
 	`org.postgresql.test.jdbc3.ParameterMetaDataTest.testTypeChangeWithUnknown`:                                                                                                "21286",
-	`org.postgresql.test.jdbc3.ProcedureTransactionTest.testProcAutoCommitFalse`:                                                                                               "17511",
 	`org.postgresql.test.jdbc3.ProcedureTransactionTest.testProcAutoCommitTrue`:                                                                                                "17511",
 	`org.postgresql.test.jdbc3.ProcedureTransactionTest.testProcWithCommitInside`:                                                                                              "17511",
-	`org.postgresql.test.jdbc3.ProcedureTransactionTest.testProcWithNoTxnControl`:                                                                                              "17511",
 	`org.postgresql.test.jdbc3.ProcedureTransactionTest.testProcWithRollbackInside`:                                                                                            "17511",
 	`org.postgresql.test.jdbc3.StringTypeParameterTest.testMultipleEnumBinds[stringType = null]`:                                                                               "27793",
 	`org.postgresql.test.jdbc3.StringTypeParameterTest.testMultipleEnumBinds[stringType = unspecified]`:                                                                        "27793",