From cb7505232df54d003a33c71264ab2e1ed3922628 Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 5 May 2026 12:05:46 +0100 Subject: [PATCH 1/2] shiftstack/merge-bot: Sync ORC with release-2.0 branch Signed-off-by: Stephen Finucane --- .../config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml b/ci-operator/config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml index d7cebb9520a84..5c9f6ee09ecba 100644 --- a/ci-operator/config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml +++ b/ci-operator/config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml @@ -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 \ From d7eefffead4917f49949b43ba766946fd5be79bc Mon Sep 17 00:00:00 2001 From: Stephen Finucane Date: Tue, 5 May 2026 17:59:54 +0100 Subject: [PATCH 2/2] shiftstack/merge-bot: Sync CPO with release-1.36 Signed-off-by: Stephen Finucane --- .../config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-operator/config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml b/ci-operator/config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml index 5c9f6ee09ecba..fded268950d9b 100644 --- a/ci-operator/config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml +++ b/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 \