Skip to content

Fix patch release backport candidate discovery - #905

Merged
kaahos merged 1 commit into
mainfrom
paul.fournillon/fix-patch-backport-discovery
Oct 26, 2026
Merged

kaahos merged 1 commit into
mainfrom
paul.fournillon/fix-patch-backport-discovery

Conversation

@kaahos

@kaahos kaahos commented Oct 26, 2026 •

Copy link
Copy Markdown
Contributor

What does this PR do?:
Fixes candidate discovery in utils/prepare-patch.sh. Adds regression coverage and documents the test command.

Motivation:
Patch preparation reported “No commits on main ahead” even when backport candidates existed. IFS= made read consume the entire + <SHA> line as the sign, so every candidate was discarded. Splitting on spaces restores detection and preserves exclusion of equivalent backports.

Additional Notes:
Agentic review: passed — Codex reviewed the full committed change against origin/main and found no actionable regressions.
Live backport and release execution: inconclusive — not exercised.

How to test the change?:

  • bash utils/tests/test_prepare_patch.sh: four cases covering equal branches, two pending PRs, a partial backport, and a complete backport.

For Datadog employees:

  • If this PR touches code that signs or publishes builds or packages, or handles
    credentials of any kind, I've requested a security review (run the dd:platform-security-review
    skill, or file a request via the PSEC review form).
    bewaire also runs automatically on every PR.
  • This PR doesn't touch any of that.
  • JIRA: N/A — no tracker ticket supplied, per author.

Unsure? Have a question? Request a review!

@kaahos
kaahos marked this pull request as ready for review October 26, 2026 13:26
@kaahos
kaahos requested a review from a team as a code owner October 26, 2026 13:26
@kaahos

kaahos commented Oct 26, 2026

Copy link
Copy Markdown
Contributor Author

@codex review

@chatgpt-codex-connector

chatgpt-codex-connector Bot commented Oct 26, 2026 •

Copy link
Copy Markdown

Codex Review Summary

This comment shows the latest Codex review activity on this pull request.

Review Status Commit Review trigger
📝 Code Review ✅ Completed 2026-10-26T13:28:05.339446Z 9245fbe Manual request
ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review" or "@codex security review".

Codex reacts with 👀 while any review is running, comments if it has suggestions, and reacts with 👍 once all reviews finish with no findings.

@chatgpt-codex-connector

Copy link
Copy Markdown

Codex Review: Didn't find any major issues. Bravo.

Reviewed commit: 9245fbec8c

ℹ️ About Codex in GitHub

Your team has set up Codex to review pull requests in this repo. Reviews are triggered when you

  • Open a pull request for review
  • Mark a draft as ready
  • Comment "@codex review".

If Codex has suggestions, it will comment; otherwise it will react with 👍.

Codex can also answer questions or update the PR. Try commenting "@codex address that feedback".

@datadog-datadog-prod-us1-2 datadog-datadog-prod-us1-2 Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Bits Code Review: PASS

More details

Space-delimited parsing restores discovery of pending commits while preserving exclusion of patch-equivalent backports. The completed static review and local Git regression coverage support both behaviors.

Was this helpful? React 👍 or 👎

Open Bits AI session

🤖 Bits Code Review · Commit 9245fbe

@kaahos
kaahos merged commit 0246a39 into main Oct 26, 2026
97 of 111 checks passed
@kaahos
kaahos deleted the paul.fournillon/fix-patch-backport-discovery branch October 26, 2026 13:31
@github-actions github-actions Bot added this to the 1.53.0 milestone Oct 26, 2026
@dd-octo-sts

dd-octo-sts Bot commented Oct 26, 2026

Copy link
Copy Markdown
Contributor

CI Test Results

Run: #40330238935 | Commit: b6da486 | Duration: 21m 32s (longest job)

✅ All 32 test jobs passed

Status Overview

JDK glibc-aarch64/debug glibc-amd64/debug musl-aarch64/debug musl-amd64/debug
8 - ✅ - -
8-ibm - ✅ - -
8-j9 ✅ ✅ - -
8-librca - - ✅ ✅
8-orcl - ✅ - -
11 - ✅ - -
11-j9 ✅ ✅ - -
11-librca - - ✅ ✅
17 ✅ ✅ - -
17-graal ✅ ✅ - -
17-j9 ✅ ✅ - -
17-librca - - ✅ ✅
21 ✅ ✅ - -
21-graal ✅ ✅ - -
21-librca - - ✅ ✅
25 ✅ ✅ - -
25-graal ✅ ✅ - -
25-librca - - ✅ ✅

Legend: ✅ passed | ❌ failed | ⚪ skipped | 🚫 cancelled

Summary: Total: 32 | Passed: 32 | Failed: 0


Updated: 2026-10-26 13:48:40 UTC

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant