shiftstack/merge-bot: Bump ORC, CPO upstream release branches

[stephenfin]

• shiftstack/merge-bot: Sync ORC with release-2.0 branch
• shiftstack/merge-bot: Sync CPO with release-1.36

/hold

We need kubernetes/cloud-provider-openstack#3104 first.

Summary by CodeRabbit

• Chores
  • Updated CI configuration for scheduled merge-bot jobs to pull newer upstream releases.

[coderabbitai]

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: Enterprise

Run ID: d4391641-5030-4fbe-984d-af01c828f2de

📥 Commits

Reviewing files that changed from the base of the PR and between 2651207 and d7eefff.

📒 Files selected for processing (1)

• ci-operator/config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml

---

Walkthrough

The PR updates two upstream release references in a CI operator merge-bot configuration file. The cloud-provider-openstack-main job now sources from release-1.36 instead of release-1.35, and the openstack-resource-controller-main job now sources from release-2.0 instead of release-1.0.

Changes

Upstream Release Version Updates

Layer / File(s)	Summary
Merge-Bot Job Configuration ci-operator/config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml	Updated cloud-provider-openstack-main job source from kubernetes/cloud-provider-openstack:release-1.35 to release-1.36 and openstack-resource-controller-main job source from k-orc/openstack-resource-controller:release-1.0 to release-2.0.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

🚥 Pre-merge checks | ✅ 12

✅ Passed checks (12 passed)

Check name	Status	Explanation
Description Check	✅ Passed	Check skipped - CodeRabbit’s high-level summary is enabled.
Title check	✅ Passed	The title accurately describes the main change: bumping upstream release branches for ORC (OpenStack Resource Controller) and CPO (Cloud Provider OpenStack) in the merge-bot configuration.
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	PR modifies only YAML CI configuration file with no Ginkgo test code. Custom check for Ginkgo test name stability is not applicable.
Test Structure And Quality	✅ Passed	This PR only modifies CI configuration YAML files (no test code). The custom check for "Test Structure and Quality" requires reviewing Ginkgo test code, which is not present in this PR.
Microshift Test Compatibility	✅ Passed	No new Ginkgo e2e tests are added in this PR. The changes only update CI job configuration (YAML) to bump upstream release branches for merge-bot jobs. The custom check is not applicable.
Single Node Openshift (Sno) Test Compatibility	✅ Passed	No Ginkgo e2e tests are added in this PR. The changes are limited to YAML CI job configuration updating version references. The SNO compatibility check is not applicable.
Topology-Aware Scheduling Compatibility	✅ Passed	PR modifies only CI operator job configuration, bumping version references. This is not a deployment manifest, operator, or controller change, so topology-aware scheduling check does not apply.
Ote Binary Stdout Contract	✅ Passed	PR only modifies YAML CI configuration file (no code changes). OTE Binary Stdout Contract check targets process-level code violations. Not applicable to configuration-only changes.
Ipv6 And Disconnected Network Test Compatibility	✅ Passed	PR updates CI operator configuration YAML files only (Shiftstack merge-bot job configs). No Ginkgo e2e tests are added, so this check is not applicable.

_{✏️ Tip: You can configure your own custom pre-merge checks in the settings.}

✨ Finishing Touches

🧪 Generate unit tests (beta)

• Create PR with unit tests

---

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

[openshift-ci]

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

[mandre]

Please remove the hold when the sync patches are ready to merge in downstream ORC and CPO.
/lgtm
/approve

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: mandre, stephenfin

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

• ci-operator/config/shiftstack/merge-bot/OWNERS [mandre,stephenfin]

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

[stephenfin]

openshift/cloud-provider-openstack#393 and openshift/openstack-resource-controller#36 have now merged.

/remove-hold

[stephenfin]

/pj-rehearse list

[openshift-merge-bot]

@stephenfin: now processing your pj-rehearse request. Please allow up to 10 minutes for jobs to trigger or cancel.

[openshift-merge-bot]

[REHEARSALNOTIFIER]
@stephenfin: 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
periodic-ci-shiftstack-merge-bot-main-openstack-resource-controller-main	N/A	periodic	Ci-operator config changed
periodic-ci-shiftstack-merge-bot-main-cloud-provider-openstack-main	N/A	periodic	Ci-operator config 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.