diff --git a/.renovate/autoMerge.json5 b/.renovate/autoMerge.json5 index 853bc47599..269d97c9f9 100644 --- a/.renovate/autoMerge.json5 +++ b/.renovate/autoMerge.json5 @@ -109,7 +109,6 @@ // Database "/cloudnative-pg/", "/dragonfly/", - "/emqx/", ], minimumReleaseAge: "12 hours", ignoreTests: false, @@ -251,6 +250,14 @@ matchPackageNames: ["/dapperdivers/"], automerge: false, }, + { + description: "Disable automerge for EMQX (broker + operator)", + // The emqx-operator can't roll even patch bumps: 6.2.3 wedged the broker + // for 8 days (rolled back in #4070; #4072 closed). EMQX carries all + // Zigbee/HA control traffic, so every bump is a watched, manual merge. + matchPackageNames: ["/emqx/"], + automerge: false, + }, { description: "Disable automerge for the CNPG Postgres image", // A bump rolls every instance of the shared database cluster (switchover