Bug 1043091 changed the logic for non-unified builds so that they're pinned to the trunk Gecko revision rather than using a fixed blacklist that needs to be updated every time a new release branch is added or removed. However, I forgot to exclude Try from the new logic (which shares the same Gecko rev as trunk), so now we're trying to schedule periodic non-unified builds there as well. If I understand the discussion in #releng correctly, this isn't actively breaking things, it's just a nuisance. I can look at this Monday if nobody beats me to it.
this is actually causing command queue failures in #buildduty ATM
Created attachment 8466492 [details] [diff] [review] patch catlee says this should work (r+ on IRC), but I haven't been able to get test-masters.sh to run locally to confirm.
fails test-masters :( Traceback (most recent call last): File "/home/catlee/.virtualenvs/buildbot-mozilla-080/local/lib/python2.7/site-packages/buildbot-0.8.2_hg_cd2b74536cbd_production_0.8-py2.7.egg/buildbot/scripts/runner.py", line 1042, in doCheckConfig ConfigLoader(configFileName=configFileName) File "/home/catlee/.virtualenvs/buildbot-mozilla-080/local/lib/python2.7/site-packages/buildbot-0.8.2_hg_cd2b74536cbd_production_0.8-py2.7.egg/buildbot/scripts/checkconfig.py", line 31, in __init__ self.loadConfig(configFile, check_synchronously_only=True) File "/home/catlee/.virtualenvs/buildbot-mozilla-080/local/lib/python2.7/site-packages/buildbot-0.8.2_hg_cd2b74536cbd_production_0.8-py2.7.egg/buildbot/master.py", line 652, in loadConfig exec f in localDict File "/home/catlee/mozilla/buildbot-configs/test-output/bm81-build_scheduler-6MjPhq/master.cfg", line 5, in <module> import config File "/tmp/tmp_1A8Rc/config.py", line 2554, in <module> TypeError: unsupported operand type(s) for +: 'generator' and 'tuple'
Created attachment 8466500 [details] [diff] [review] patch v2 Probably not the prettiest solution, but should work I'd think.
Comment on attachment 8466500 [details] [diff] [review] patch v2 Review of attachment 8466500 [details] [diff] [review]: ----------------------------------------------------------------- ::: mozilla/config.py @@ +2555,5 @@ > for pc in branch['platforms'].values(): > if 'enable_nonunified_build' in pc: > pc['enable_nonunified_build'] = False > +# Don't try to schedule non-unified builds on Try either > +for branch in ("try"): this needs to be ("try",) weird python-ism.
Comment on attachment 8466500 [details] [diff] [review] patch v2 r+ with the comma added. it removes these builders: Builders removed - Android 2.2 Debug try non-unified - Android 2.2 try non-unified - Linux x86-64 try leak test non-unified - Linux x86-64 try non-unified - OS X 10.7 64-bit try leak test non-unified - OS X 10.7 try non-unified - WINNT 5.2 try leak test non-unified - WINNT 5.2 try non-unified
Comment on attachment 8466500 [details] [diff] [review] patch v2 Thanks for sticking with me :) https://hg.mozilla.org/build/buildbot-configs/rev/2861502416cd
Merged to production, reconfig'd try and scheduler masters.
Deleted dead jobs in command_queues (verified they were all for nonunified jobs first).
Thanks Nick! Sorry for the hassle - been having to say that a lot lately :(