Skip to content

OSPRH-33246: Add rebasebot post-rebase hook script - #42

Open
dlaw4608 wants to merge 1 commit into
openshift:mainfrom
shiftstack:post-rebase-script
Open

dlaw4608 wants to merge 1 commit into
openshift:mainfrom
shiftstack:post-rebase-script

Conversation

@dlaw4608

Copy link
Copy Markdown

Adds hack/rebasebot-helpers/post-rebase.sh, a post-rebase hook script for ShiftStacks migration from merge-bot to rebasebot.

This replaces the merge-bot --run-make flag which ran make merge-bot after each rebase. The script runs make merge-bot (full-vendoring, generate, generate-openshift) and commits the results, following the pattern used by cluster-capi-operator.

The rebasebot periodic configs in openshift/release will reference this script via:
--post-rebase-hook git:dest/main:hack/rebasebot-helpers/post-rebase.sh

  This script is invoked by rebasebot via --post-rebase-hook to run
  `make merge-bot` after a rebase, replacing the merge-bot --run-make flag.

Signed-off-by: Daniel Lawton <dlawton@redhat.com>
@openshift-ci-robot

openshift-ci-robot commented Jul 30, 2026 •

Copy link
Copy Markdown

@dlaw4608: This pull request references OSPRH-33246 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the task to target the "5.0.0" version, but no target version was set.

Details

In response to this:

Adds hack/rebasebot-helpers/post-rebase.sh, a post-rebase hook script for ShiftStacks migration from merge-bot to rebasebot.

This replaces the merge-bot --run-make flag which ran make merge-bot after each rebase. The script runs make merge-bot (full-vendoring, generate, generate-openshift) and commits the results, following the pattern used by cluster-capi-operator.

The rebasebot periodic configs in openshift/release will reference this script via:
--post-rebase-hook git:dest/main:hack/rebasebot-helpers/post-rebase.sh

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jul 30, 2026
@openshift-ci
openshift-ci Bot requested review from mandre and stephenfin July 30, 2026 12:31
@openshift-ci

openshift-ci Bot commented Jul 30, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign gryf for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found here.

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@dlaw4608

dlaw4608 commented Aug 5, 2026

Copy link
Copy Markdown
Author

/retest

4 similar comments
@dlaw4608

dlaw4608 commented Aug 5, 2026

Copy link
Copy Markdown
Author

/retest

@dlaw4608

dlaw4608 commented Aug 6, 2026

Copy link
Copy Markdown
Author

/retest

@dlaw4608

Copy link
Copy Markdown
Author

/retest

@dlaw4608

Copy link
Copy Markdown
Author

/retest

@openshift-ci

openshift-ci Bot commented Aug 13, 2026

Copy link
Copy Markdown

@dlaw4608: all tests passed!

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.

@winiciusallan

Copy link
Copy Markdown
Member

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Aug 14, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants