From 237beceeeed434477e909675e9195a70c6b8d2db Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 25 Nov 2024 14:20:20 -0500 Subject: [PATCH] shiftstack/merge-bot: `--run-make` on 4.17 and 4.16 We added the Makefile targets in CAPO 4.17 and 4.16 too so let's use it. --- .../config/shiftstack/merge-bot/shiftstack-merge-bot-main.yaml | 2 ++ 1 file changed, 2 insertions(+) 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 d638d92e1c4a8..1f7dc91c643a4 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 @@ -97,6 +97,7 @@ tests: --dest openshift/cluster-api-provider-openstack:release-4.17 \ --merge shiftstack/cluster-api-provider-openstack:merge-bot-release-4.17 \ --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 \ @@ -125,6 +126,7 @@ tests: --dest openshift/cluster-api-provider-openstack:release-4.16 \ --merge shiftstack/cluster-api-provider-openstack:merge-bot-release-4.16 \ --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 \