From 1199127a3a5f29bf70b210286f5163cca9ab1ea7 Mon Sep 17 00:00:00 2001 From: Yahor Yuzefovich Date: Thu, 21 Mar 2024 10:38:24 -0700 Subject: [PATCH 1/2] roachtest: update pgjdbc blocklist 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). Epic: None Release note: None --- pkg/cmd/roachtest/tests/pgjdbc_blocklist.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkg/cmd/roachtest/tests/pgjdbc_blocklist.go b/pkg/cmd/roachtest/tests/pgjdbc_blocklist.go index f5788279270e..dec14884f943 100644 --- 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", From b4fdae8b9001c7c29a08e8c82958aecbd83dc31e Mon Sep 17 00:00:00 2001 From: Ricky Stewart Date: Thu, 21 Mar 2024 11:45:41 -0500 Subject: [PATCH 2/2] workflows: run `examples-orms` on non-FIPS machines This was an accident. Epic: CRDB-8308 Release note: None --- .github/workflows/github-actions-essential-ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/github-actions-essential-ci.yml b/.github/workflows/github-actions-essential-ci.yml index ab24d684564c..a6bf9ee00fb3 100644 --- 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: