Skip to content

ShiftStack/Sync Tooling Migration: Added rebasebot repository #77535

Open
dlaw4608 wants to merge 1 commit intoopenshift:mainfrom
shiftstack:sync_migrate_cpo_main
Open

ShiftStack/Sync Tooling Migration: Added rebasebot repository #77535
dlaw4608 wants to merge 1 commit intoopenshift:mainfrom
shiftstack:sync_migrate_cpo_main

Conversation

@dlaw4608
Copy link
Copy Markdown

@dlaw4608 dlaw4608 commented Apr 8, 2026

This is a preliminary iteration, the goal is to see a successful migration with no errors for one project migration before proceeding with a full migration for all repos/branches in ci-operator/config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml to use rebasebot.

This will be useful as merge-bot was forked a few years ago by openshift-eng team, and the resulting tool, rebasebot, is significantly more advanced.

  • Chose to migrate only one repo as a first iteration, cloud-provider-openstack-main
  • Builds rebasebot image from shiftstack fork
  • Reuses existing credentials from merge-bot (FTM)
  • cron schedule changed will occur 2 hours earlier to not overlap

Equivalent merge-bot backup will be removed when rebasebot is verified to work successfully in this PR.

@openshift-ci openshift-ci bot requested review from gryf and mandre April 8, 2026 11:01
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 8, 2026

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by: dlaw4608
Once this PR has been reviewed and has the lgtm label, please assign mandre 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

@openshift-ci-robot
Copy link
Copy Markdown
Contributor

@dlaw4608, pj-rehearse: unable to determine affected jobs. This could be due to a branch that needs to be rebased. ERROR:

could not load configuration from candidate revision of release repo: failed to load ci-operator configuration from release repo: failed to load ci-operator config (error unmarshaling JSON: json: cannot unmarshal array into Go struct field ReleaseBuildConfiguration.images of type api.ImageConfiguration)
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@dlaw4608 dlaw4608 force-pushed the sync_migrate_cpo_main branch from 14f9200 to 88ff590 Compare April 8, 2026 11:27
@dlaw4608
Copy link
Copy Markdown
Author

dlaw4608 commented Apr 8, 2026

/retest-required

…t to rebasebot

- Chose to migrate only one repo as a first iteration, cloud-provider-openstack-main.
- Builds rebasebot image from shiftstack fork
- Reuses existing credentials from merge-bot
- cron schedule changed will occur 2 hours earlier

Equivalent merge-bot backup will be removed when rebasebot is verified to work successfully in this PR

Signed-off-by: Daniel Lawton <dlawton@redhat.com>
@dlaw4608 dlaw4608 force-pushed the sync_migrate_cpo_main branch from 88ff590 to 41778c3 Compare April 8, 2026 12:36
@openshift-ci-robot
Copy link
Copy Markdown
Contributor

[REHEARSALNOTIFIER]
@dlaw4608: the pj-rehearse plugin accommodates running rehearsal tests for the changes in this PR. Expand 'Interacting with pj-rehearse' for usage details. The following rehearsable tests have been affected by this change:

Test name Repo Type Reason
pull-ci-shiftstack-rebasebot-main-images shiftstack/rebasebot presubmit Presubmit changed
pull-ci-shiftstack-rebasebot-main-lint shiftstack/rebasebot presubmit Presubmit changed
pull-ci-shiftstack-rebasebot-main-unit shiftstack/rebasebot presubmit Presubmit changed
periodic-ci-shiftstack-rebasebot-main-cloud-provider-openstack-main N/A periodic Periodic changed
Interacting with pj-rehearse

Comment: /pj-rehearse to run up to 5 rehearsals
Comment: /pj-rehearse skip to opt-out of rehearsals
Comment: /pj-rehearse {test-name}, with each test separated by a space, to run one or more specific rehearsals
Comment: /pj-rehearse more to run up to 10 rehearsals
Comment: /pj-rehearse max to run up to 25 rehearsals
Comment: /pj-rehearse auto-ack to run up to 5 rehearsals, and add the rehearsals-ack label on success
Comment: /pj-rehearse list to get an up-to-date list of affected jobs
Comment: /pj-rehearse abort to abort all active rehearsals
Comment: /pj-rehearse network-access-allowed to allow rehearsals of tests that have the restrict_network_access field set to false. This must be executed by an openshift org member who is not the PR author

Once you are satisfied with the results of the rehearsals, comment: /pj-rehearse ack to unblock merge. When the rehearsals-ack label is present on your PR, merge will no longer be blocked by rehearsals.
If you would like the rehearsals-ack label removed, comment: /pj-rehearse reject to re-block merging.

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci bot commented Apr 8, 2026

@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.

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