Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pkg/testutils/release/cockroach_releases.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
- 23.1.0
predecessor: "22.2"
"23.2":
latest: 23.2.29
latest: 23.2.30
predecessor: "23.1"
"24.1":
latest: 24.1.26
latest: 24.1.27
predecessor: "23.2"
"24.2":
latest: 24.2.10
Expand Down Expand Up @@ -50,4 +50,4 @@
"26.2":
predecessor: "26.1"
"26.3":
predecessor: "26.1"
predecessor: "26.2"
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can't remember if we can do this update yet (it depends on where we are in the M.x tasks)

lemme take a look in a bit

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

After digging into the code: this update is safe to do at any time, regardless of where we are in the M.x cycle.

Why: predecessorSeries() in pkg/testutils/release/releases.go already skips unreleased series (those with empty Latest) when walking the predecessor chain. So setting predecessor: "26.2" now — even though 26.2 has no release yet — produces identical runtime behavior to predecessor: "26.1". The code would just skip 26.2 and fall through to 26.1 either way.

There's even an explicit test case for this: "skips unreleased predecessor" in releases_test.go.

The M.1 runbook currently directs the operator to use series-2 (instead of series-1) as a temporary measure, saying it will be corrected in M.3. That guidance is unnecessary — series-1 is always safe. We'll update the runbook in a follow-up PR.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

runbook update: #168049

Loading