shiftstack/merge-bot: Bump ORC, CPO upstream release branches (#78860)

* shiftstack/merge-bot: Sync ORC with release-2.0 branch

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

* shiftstack/merge-bot: Sync CPO with release-1.36

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

---------

Signed-off-by: Stephen Finucane <stephenfin@redhat.com>

Author: stephenfin

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

@@ -276,7 +276,7 @@ tests:
     test:
     - as: cloud-provider-openstack-main
       commands: |
-        merge-bot --source https://github.com/kubernetes/cloud-provider-openstack:release-1.35 \
+        merge-bot --source https://github.com/kubernetes/cloud-provider-openstack:release-1.36 \
                   --dest openshift/cloud-provider-openstack:main \
                   --merge shiftstack/cloud-provider-openstack:merge-bot-main \
                   --update-go-modules \
@@ -538,7 +538,7 @@ tests:
     test:
     - as: openstack-resource-controller-main
       commands: |
-        merge-bot --source https://github.com/k-orc/openstack-resource-controller:release-1.0 \
+        merge-bot --source https://github.com/k-orc/openstack-resource-controller:release-2.0 \
                   --dest openshift/openstack-resource-controller:main \
                   --merge shiftstack/openstack-resource-controller:merge-bot-main \
                   --update-go-modules \