Last modified: 2013-08-27 15:49:51 UTC
Zuul does report back to Gerrit whenever a change can not be merged on tip of the branch so we no more need to have the -merge jobs. The -merge jobs were needed before Zuul was reporting the issue back in Gerrit, nowadays it is entirely useless.
Steps: - remove the -merge triggers from Zuul - test :) - remove the -merge definitions from jjb - delete the old jobs
Change 73944 had a related patch set uploaded by Hashar: remove mediawiki-core-merge https://gerrit.wikimedia.org/r/73944
Change 73944 merged by Hashar: remove mediawiki-core-merge https://gerrit.wikimedia.org/r/73944
Change 73947 had a related patch set uploaded by Hashar: remove all -merge jobs https://gerrit.wikimedia.org/r/73947
Created attachment 12861 [details] Zuul debug log for https://gerrit.wikimedia.org/r/#/c/70646/5 which had a conflict with tip of master in RELEASE-NOTES-1.22
Change 73947 had a related patch set uploaded by Krinkle: remove all -merge jobs https://gerrit.wikimedia.org/r/73947
Change 73947 merged by Hashar: Remove all -merge jobs https://gerrit.wikimedia.org/r/73947
I have deployed the change. Will monitor for a couple of days then close this bug.
This is now simply about cleaning up the job history in Jenkins. Lowering priority and moving back to pool.
Deleting jobs in parallel cause Jenkins threads to deadlock ( bug 51802 ). I am rerunning the deletions sequentially: cat /tmp/mergejobs |xargs -n1 jenkins-jobs --conf jenkins_jobs.ini delete Where /tmp/mergejobs is a list of the -merge jobs :-)
All merge jobs have been deleted.
Change 81228 had a related patch set uploaded by Hashar: get rid of -merge jobs (no more triggered) https://gerrit.wikimedia.org/r/81228
Change 81228 merged by jenkins-bot: get rid of -merge jobs (no more triggered) https://gerrit.wikimedia.org/r/81228
This is really fixed. The Gerrit bot simply reopened it.
