Skip to content

OSPRH-33249: retire merge-bot periodics - #83070

Open
dlaw4608 wants to merge 1 commit into
openshift:mainfrom
shiftstack:retire_mergebot_shiftstack
Open

OSPRH-33249: retire merge-bot periodics #83070
dlaw4608 wants to merge 1 commit into
openshift:mainfrom
shiftstack:retire_mergebot_shiftstack

Conversation

@dlaw4608

@dlaw4608 dlaw4608 commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

We've moved these syncs over to rebasebot in the individual repos, so the old central merge-bot periodics can go.
This removes the 18 merge-bot periodics for CAPO, CPO, csi-driver-nfs, and ORC. Leaving lint and unittests in place since merge-bot itself is still around. Also I cleaned up the unused merge-bot image build and the leftover sanitize-prow-jobs entry for the deleted periodics file.

This will be on hold until the changes in #82967 are merged and confirmed to be working.

Summary by CodeRabbit

  • Retires 18 central merge-bot periodics for CAPO, CPO, csi-driver-nfs, and ORC because their syncs now run through rebasebot.
  • Keeps merge-bot lint and unit-test periodics active.
  • Removes the unused merge-bot image build and stale sanitize-prow-jobs entry.
  • The changes remain on hold until PR #82967 is merged and confirmed working.

  Keep lint and unittests for the still-active merge-bot repo.

Signed-off-by: Daniel Lawton <dlawton@redhat.com>
@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Aug 6, 2026
@openshift-ci-robot

openshift-ci-robot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

@dlaw4608: This pull request references OSPRH-33249 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 sub-task to target the "5.0.0" version, but no target version was set.

Details

In response to this:

We've moved these syncs over to rebasebot in the individual repos, so the old central merge-bot periodics can go.
This removes the 18 merge-bot periodics for CAPO, CPO, csi-driver-nfs, and ORC. Leaving lint and unittests in place since merge-bot itself is still around. Also cleaned up the unused merge-bot image build and the leftover sanitize-prow-jobs entry for the deleted periodics file.
This will be on hold until the changes in #82967 are merged and confirmed to be working.

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
openshift-ci Bot requested review from danilo-gemoli and mandre August 6, 2026 21:37
@openshift-ci

openshift-ci Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

[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 danilo-gemoli, 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 6, 2026

Copy link
Copy Markdown
Contributor Author

/hold

@openshift-ci openshift-ci Bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Aug 6, 2026
@coderabbitai

coderabbitai Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

No actionable comments were generated in the recent review. 🎉

ℹ️ Recent review info
⚙️ Run configuration

Configuration used: Repository YAML (base), Central YAML (inherited)

Review profile: CHILL

Plan: Pro Plus

Run ID: f8015b32-783e-48a3-9436-986c7f582f51

📥 Commits

Reviewing files that changed from the base of the PR and between 6200a4e and 412fbff.

⛔ Files ignored due to path filters (2)
  • ci-operator/jobs/shiftstack/merge-bot/shiftstack-merge-bot-main-periodics.yaml is excluded by !ci-operator/jobs/**
  • ci-operator/jobs/shiftstack/merge-bot/shiftstack-merge-bot-main-presubmits.yaml is excluded by !ci-operator/jobs/**
📒 Files selected for processing (2)
  • ci-operator/config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml
  • core-services/sanitize-prow-jobs/_config.yaml
💤 Files with no reviewable changes (2)
  • core-services/sanitize-prow-jobs/_config.yaml
  • ci-operator/config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml

Walkthrough

The change removes the ShiftStack merge-bot image configuration and scheduled jobs. It also removes the corresponding periodic-job entry from the sanitize-prow-jobs configuration.

Changes

ShiftStack merge-bot removal

Layer / File(s) Summary
Remove merge-bot build and scheduled jobs
ci-operator/config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml, core-services/sanitize-prow-jobs/_config.yaml
The configuration no longer builds the merge-bot image or schedules periodic jobs for the listed OpenStack-related projects. The sanitize-prow-jobs list no longer includes the removed periodic-job file.

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

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly and concisely describes the retirement of the merge-bot periodics, which is the main change.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
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.
Stable And Deterministic Test Names ✅ Passed The PR changes only YAML CI configuration; the patch adds no Ginkgo test titles or test implementation, so no unstable or overly specific test names are present.
Test Structure And Quality ✅ Passed Not applicable: the PR changes only Prow YAML configuration and deletes periodic jobs; the diff contains no Ginkgo test code or It/BeforeEach/Eventually/Expect calls.
Microshift Test Compatibility ✅ Passed The pull request adds no Ginkgo tests or test source; it only changes YAML CI configuration and removes periodics.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new Ginkgo e2e tests were added. The commit only removes merge-bot YAML jobs and image configuration, removes a sanitize entry, and adds presubmit settings.
Topology-Aware Scheduling Compatibility ✅ Passed The PR only removes CI image and periodic-job configuration; the remaining changes add no topology or Kubernetes scheduling constraints.
Ote Binary Stdout Contract ✅ Passed The PR changes only YAML configuration; added lines are two skip_cloning entries, with no Go/source stdout or suite-setup code changes.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed The PR changes only YAML CI configuration, adds no Ginkgo declarations or test source, and deletes merge-bot jobs; IPv6 or external-connectivity test checks are not applicable.
No-Weak-Crypto ✅ Passed The patch adds only two skip_cloning: true YAML settings; searches of all added lines found no MD5, SHA1, DES, RC4, 3DES, Blowfish, ECB, custom crypto, or secret comparisons.
Container-Privileges ✅ Passed The patch adds no privileged, host namespace, SYS_ADMIN, or allowPrivilegeEscalation settings; the retained image uses USER 0:0 only for chown, then switches to USER 1001:1001.
No-Sensitive-Data-In-Logs ✅ Passed The commit adds no logging or sensitive-data output; it deletes periodics and image configuration, and only adds two skip_cloning: true settings.
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

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

@openshift-merge-bot

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-merge-bot-main-lint shiftstack/merge-bot presubmit Ci-operator config changed
pull-ci-shiftstack-merge-bot-main-unittests shiftstack/merge-bot presubmit Ci-operator config changed

Prior to this PR being merged, you will need to either run and acknowledge or opt to skip these rehearsals.

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

openshift-ci Bot commented Aug 6, 2026

Copy link
Copy Markdown
Contributor

@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

do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants