Page MenuHomePhabricator
Create Task
Maniphest T53395

Jenkins: Remove the -merge jobs
Closed, ResolvedPublic
Actions

Description

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.

Version: wmf-deployment
Severity: enhancement

Details

Reference
bz51395

Event Timeline

• bzimport raised the priority of this task from to Low.Nov 22 2014, 1:59 AM
• bzimport added a project: Continuous-Integration-Infrastructure.
• bzimport set Reference to bz51395.
hashar created this task.Jul 15 2013, 8:41 PM
hashar added a comment.Jul 15 2013, 8:42 PM

Steps:

  • remove the -merge triggers from Zuul
  • test :)
  • remove the -merge definitions from jjb
  • delete the old jobs
gerritbot added a comment.Jul 16 2013, 10:40 AM

Change 73944 had a related patch set uploaded by Hashar:
remove mediawiki-core-merge

https://gerrit.wikimedia.org/r/73944

gerritbot added a comment.Jul 16 2013, 10:40 AM

Change 73944 merged by Hashar:
remove mediawiki-core-merge

https://gerrit.wikimedia.org/r/73944

gerritbot added a comment.Jul 16 2013, 10:51 AM

Change 73947 had a related patch set uploaded by Hashar:
remove all -merge jobs

https://gerrit.wikimedia.org/r/73947

hashar added a comment.Jul 16 2013, 1:38 PM

Created attachment 12861
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

Attached:

file_51395.txt2 KBDownload

gerritbot added a comment.Jul 16 2013, 2:29 PM

Change 73947 had a related patch set uploaded by Krinkle:
remove all -merge jobs

https://gerrit.wikimedia.org/r/73947

gerritbot added a comment.Jul 16 2013, 2:48 PM

Change 73947 merged by Hashar:
Remove all -merge jobs

https://gerrit.wikimedia.org/r/73947

hashar added a comment.Jul 16 2013, 2:53 PM

I have deployed the change. Will monitor for a couple of days then close this bug.

hashar added a comment.Jul 19 2013, 7:07 PM

This is now simply about cleaning up the job history in Jenkins. Lowering priority and moving back to pool.

hashar added a comment.Jul 22 2013, 11:22 AM

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 :-)

hashar added a comment.Jul 22 2013, 11:48 AM

All merge jobs have been deleted.

gerritbot added a comment.Aug 27 2013, 2:01 PM

Change 81228 had a related patch set uploaded by Hashar:
get rid of -merge jobs (no more triggered)

https://gerrit.wikimedia.org/r/81228

gerritbot added a comment.Aug 27 2013, 2:03 PM

Change 81228 merged by jenkins-bot:
get rid of -merge jobs (no more triggered)

https://gerrit.wikimedia.org/r/81228

hashar added a comment.Aug 27 2013, 3:49 PM

This is really fixed. The Gerrit bot simply reopened it.

Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL