https://bugzilla.wikimedia.org/show_bug.cgi?id=66683
--- Comment #5 from Bryan Davis <[email protected]> --- Created attachment 15801 --> https://bugzilla.wikimedia.org/attachment.cgi?id=15801&action=edit bash script to update puppet checkout in /var/lib/git/operations/puppet Attaching the script that has been running on deployment-salt for a couple of weeks. The script generally runs with no issues but occasionally gets tripped up by the merge of a cherry-picked patch that has been amended in gerrit but not updated in deployment-salt to use the latest version. When this happens, I have manually corrected via: * git rebase --abort * git rebase --interactive ** Remove the merged patch causing the conflict by deleting its line At the moment I'm leaning towards using Jenkins to manage the repo on deployment-salt as this could be hooked into the operations/puppet gerrit repo to update beta on each upstream commit and would also provide a means of notification in the case of rebase failures. The unfortunate drawback to this would be that it's a solution very specific to beta and not a general solution for anyone using a self-hosted puppetmaster in labs. -- You are receiving this mail because: You are on the CC list for the bug. _______________________________________________ Wikibugs-l mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/wikibugs-l
