Last modified: 2014-09-25 15:42:47 UTC
The beta cluster uses a cron job introduced in <https://gerrit.wikimedia.org/r/#/c/151099/> to fetch the latest operations/puppet.git upstream changes and rebase the local commits and cherry-picks on that new head. This works great except when it breaks due to an outdated cherry-pick in the local repo or a merge conflict with the new head and a local commit. The current script has logging and a sane recovery method for dealing with this problem, but it does not have an alerting method. Additionally because it rebases once per hour it can sometimes be tricky to figure out exactly which locally applied changes are in conflict with which upstream changes. I would like to see this process converted to a Jenkins job with a Zuul trigger on merges to the operations/puppet.git repository. This will allow us to see exactly which upstream merge first broke the rebase and also allow us to alert in the #-qa irc channel and possibly even #-operations when the rebase fails.
(+1 to alerting both #-qa and #-operations)
