Skip to content

Conversation

@fqazi
Copy link
Collaborator

@fqazi fqazi commented Nov 22, 2025

Backport 1/1 commits from #158200 on behalf of @fqazi.


Currently, the activerecord test can fail due to flakes inside client side encryption tests, which aren't linked to CRDB. To address this, this patch marks them as flaky.

Fixes: #157810

Release note: None


Release justification:

Currently, the activerecord test can fail due to flakes inside client
side encryption tests, which aren't linked to CRDB. To address this,
this patch marks them as flaky.

Fixes: cockroachdb#157810

Release note: None
@fqazi fqazi force-pushed the blathers/backport-release-24.1-158200 branch from d17b399 to ec424fc Compare November 22, 2025 04:05
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Nov 22, 2025
@blathers-crl blathers-crl bot requested a review from spilchen November 22, 2025 04:05
@blathers-crl
Copy link

blathers-crl bot commented Nov 22, 2025

Thanks for opening a backport.

Before merging, please confirm that it falls into one of the following categories (select one):

  • Non-production code changes. Includes test-only changes, build system changes, etc.
  • Fixes for serious issues. Defined in the policy as correctness, stability, or security issues, data corruption/loss, significant performance regressions, breaking working and widely used functionality, or an inability to detect and debug production issues.
  • Other approved changes. These changes must be gated behind a disabled-by-default feature flag unless there is a strong justification not to.

Add a brief release justification to the PR description explaining your selection.

Also, confirm that the change does not break backward compatibility and complies with all aspects of the backport policy.

All backports must be reviewed by the TL and EM for the owning area.

@blathers-crl blathers-crl bot added backport Label PR's that are backports to older release branches T-sql-foundations SQL Foundations Team (formerly SQL Schema + SQL Sessions) labels Nov 22, 2025
@blathers-crl
Copy link

blathers-crl bot commented Nov 22, 2025

✅ PR #158227 is compliant with backport policy

Confidence: high
Backward compatible: true
Explanation: The pull request modifies a file 'pkg/cmd/roachtest/tests/activerecord_blocklist.go' that is categorized under non-production code as it pertains to roachtest, which is a development tool used for testing CockroachDB. Since the changes are confined to development tool infrastructure, the backport is exempt from the standard policy requirements regarding critical bugs and feature flags. Additionally, there is no requirement for a release justification text in cases where only non-production files are changed.

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@blathers-crl blathers-crl bot added the backport-test-only Used to denote the backport has only non-production changes label Nov 22, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backport Label PR's that are backports to older release branches backport-test-only Used to denote the backport has only non-production changes blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. T-sql-foundations SQL Foundations Team (formerly SQL Schema + SQL Sessions)

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants