Skip to content

ROX-36649: remove empty commit from patch release - #3816

Open
alkmim wants to merge 1 commit into
masterfrom
alkmim/ROX-36649-remove-empty-commit-step
Open

ROX-36649: remove empty commit from patch release#3816
alkmim wants to merge 1 commit into
masterfrom
alkmim/ROX-36649-remove-empty-commit-step

Conversation

@alkmim

@alkmim alkmim commented Sep 11, 2026

Copy link
Copy Markdown

Remove the empty commit from patch release script. See https://redhat.atlassian.net/browse/ROX-36649 for context

@alkmim
alkmim requested a review from a team as a code owner September 11, 2026 20:59
@alkmim alkmim self-assigned this Sep 11, 2026
Comment thread scripts/patch-release.sh
Comment on lines -346 to -357
local head_commit_msg
head_commit_msg=$(git log -1 --format='%s' "$branch_ref")

if [[ "$head_commit_msg" =~ ^Release\ [0-9]+\.[0-9]+\.[0-9]+$ ]]; then
log_warn "Tip of $release_branch is already a release commit: $head_commit_msg"
if ! confirm "Create another release commit on top?"; then
log_info "Aborted by user."
exit 0
fi
echo
fi

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.

Why remove this check?

Comment thread scripts/patch-release.sh
Comment on lines +434 to +436
# Note: this intentionally does NOT create a new commit. Tagging HEAD directly
# avoids pushing a commit to the protected release branch, so no "bypass branch
# protection" permission is required (see ROX-36649).

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.

You documenting planning and historical steps, not augmenting the code to facilitate readability.

@coderabbitai

coderabbitai Bot commented Sep 11, 2026

Copy link
Copy Markdown

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Central YAML (base), Organization UI (inherited)

Review profile: CHILL

Plan: Advanced

Run ID: 7245e5ce-a91e-4648-99ef-4fa93c11857d

📥 Commits

Reviewing files that changed from the base of the PR and between b8aa5cb and 90ed5d2.

📒 Files selected for processing (1)
  • scripts/patch-release.sh

Included review availability: Your plan provides up to 1 included review per hour; 0 remain after this review.


📝 Summary

Summary by CodeRabbit

  • Chores
    • Streamlined the release process by applying release tags directly to the current release state.
    • Releases now publish only the necessary tag, reducing unrelated branch updates.
    • Removed outdated release checks and prerequisites from the process.

Walkthrough

The patch release script now tags the current release branch HEAD directly. It no longer creates an empty release commit or pushes the release branch. The branch protection prerequisite and duplicate release-commit check were removed.

Changes

Patch release flow

Layer / File(s) Summary
Tag and publish the current HEAD
scripts/patch-release.sh
The script resolves the release branch, creates an annotated tag on the current HEAD, and pushes only the tag. It removes the release-commit confirmation and branch protection prerequisite.

Priority: ⬇️ Low

Estimated code review effort: 2 (Simple) | ~10 minutes

Change: Bug fix

Suggested reviewers: jvdm

Sequence Diagram(s)

sequenceDiagram
  participant PatchReleaseScript
  participant LocalGitRepository
  participant RemoteGitRepository
  PatchReleaseScript->>LocalGitRepository: Resolve release branch reference
  PatchReleaseScript->>LocalGitRepository: Create annotated tag at current HEAD
  PatchReleaseScript->>RemoteGitRepository: Push release tag only
Loading

Merge Risk: ⚪ Minimal · up to 90ed5

The tag-only release flow has no confirmed merge-blocking issue.

🚥 Pre-merge checks | ✅ 4 | ❌ 1

❌ Failed checks (1 warning)

Check name Status Explanation Resolution
Docstring Coverage ⚠️ Warning Docstring coverage is 50.00% which is insufficient. The required threshold is 80.00%. Docstring coverage is scoped to functions touched by this diff. Analyzed 2 functions across 1 files. Write docstrings for the functions missing them to satisfy the coverage threshold.
✅ Passed checks (4 passed)
Check name Status Explanation
Title check ✅ Passed The title clearly identifies the removal of the empty commit from the patch release process and matches the main change.
Description check ✅ Passed The description directly explains that the pull request removes the empty commit from the patch release script and references the related issue.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
  • Fix all pre-merge checks with AI
✨ Finishing Touches 💡 1
📝 Generate docstrings 💡
  • Create stacked PR
  • Commit on current branch
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Commit unit tests in branch alkmim/ROX-36649-remove-empty-commit-step

Comment @coderabbitai help to get the list of available commands.

@openshift-ci

openshift-ci Bot commented Sep 11, 2026

Copy link
Copy Markdown

@alkmim: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/slim-e2e-tests 90ed5d2 link false /test slim-e2e-tests
ci/prow/e2e-tests 90ed5d2 link false /test e2e-tests

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

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.

2 participants