fix: resolve CockroachDB test failures and promote to required CI#1996

bpamiri wants to merge 1 commit intodevelopwheels-dev/wheels:developfrom

peter/cockroachdb-promotewheels-dev/wheels:peter/cockroachdb-promoteCopy head branch name to clipboard