From d8a8d97baad2394227df17a9eb8dfd2b90db805e Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Fri, 7 Feb 2025 12:16:10 -0500 Subject: [PATCH] ORC: run `make merge-bot` for sync We need to generate OpenShift specific manifests so we run a specific Makefile target like we do for CAPO. --- .../config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml | 1 + 1 file changed, 1 insertion(+) 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 7732650a299b4..744508ae8f91e 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 @@ -435,6 +435,7 @@ tests: --dest openshift/openstack-resource-controller:main \ --merge shiftstack/openstack-resource-controller:merge-bot-main \ --update-go-modules \ + --run-make \ --bot-name shiftstack-merge-bot --bot-email shiftstack-merge-bot@redhat.com \ --github-app-key /secrets/merge-bot/github_private_key \ --github-cloner-key /secrets/merge-bot/github_cloner_private_key \