1049099 - Thunderbird Linux and Mac MozMill builders are using the system python (fix bustage on Thunderbird Mac MozMill builders)

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Mark Banner (:standard8)]

Attachment: Possible fix

On Mac, we've just noticed our MozMill builders are running 2.6, and we have bustage because of it.

It appears there's an old bit of code that was introduced when we first ported Thunderbird's MozMill test infrastructure to it.

I'm guessing that the right thing to do here, is to just use 'python' rather than a directory-specific python, and hopefully then buildbot will do the right thing?

I think we're safe to apply this to all branches, as non-Mac already seem to run 2.7.

Comment 1

[Mark Banner (:standard8)]

Attachment: Attempt fix Mac 10.6 xpcshell-test builders as well

Thunderbird also hasn't switched to mozharness yet, and I just realised our 10.6 builders are on python as well. I think if we tweak the path, then it might just do the right thing, though I'm not entirely sure.

Comment 2

[Nick Thomas [:nthomas] (UTC+12)]

Comment on attachment 8467995 [details] [diff] [review]
Possible fix

Review of attachment 8467995 [details] [diff] [review]:
-----------------------------------------------------------------

Sorry, I hadn't realized this was in mozmill only code and had been trying to see if jetpack was going to barf. *stamp*

Comment 3

[Nick Thomas [:nthomas] (UTC+12)]

Comment on attachment 8468003 [details] [diff] [review]
Attempt fix Mac 10.6 xpcshell-test builders as well

Review of attachment 8468003 [details] [diff] [review]:
-----------------------------------------------------------------

::: mozilla-tests/thunderbird_config.py
@@ +55,5 @@
>  PLATFORMS['macosx64']['mountainlion'] = {'name': builder_prefix + "Rev5 MacOSX Mountain Lion 10.8"}
>  PLATFORMS['macosx64']['stage_product'] = 'thunderbird'
>  PLATFORMS['macosx64']['mozharness_python'] = '/tools/buildbot/bin/python'
> +# Workaround to get correct python version whilst Thunderbird doesn't have mozharnees
> +PLATFORMS['macosx64']['env']['PATH'] = '/tools/buildbot/bin/python:/tools/python/bin:/tools/buildbot/bin:/opt/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:/usr/local/bin:/usr/X11/bin'

You meant
  PLATFORMS['macosx64']['env']['PATH'] = '/tools/buildbot/bin:/tools/...
and 'mozharness', yes ?  (put executable on the path, and typo respectively). I'll assume so and go with 'r+, please fix on landing'.

Comment 4

[Mark Banner (:standard8)]

Comment on attachment 8467995 [details] [diff] [review]
Possible fix

https://hg.mozilla.org/build/buildbotcustom/rev/6fbad08caf0e

Comment 5

[Mark Banner (:standard8)]

Comment on attachment 8468003 [details] [diff] [review]
Attempt fix Mac 10.6 xpcshell-test builders as well

Checked in with comments addressed:

https://hg.mozilla.org/build/buildbot-configs/rev/d4e7c7c13989

Comment 6

[Chris Cooper [:coop] (he/him)]

I had to back this out:

(tests_scheduler)[[e-mail] tests_scheduler]$ make checkconfig
cd master && /builds/buildbot/tests_scheduler/bin/buildbot checkconfig
Traceback (most recent call last):
  File "/builds/buildbot/tests_scheduler/lib/python2.7/site-packages/buildbot-0.8.2_hg_8a9e33843c3f_production_0.8-py2.7.egg/buildbot/scripts/runner.py", line 1042, in doCheckConfig
    ConfigLoader(configFileName=configFileName)
  File "/builds/buildbot/tests_scheduler/lib/python2.7/site-packages/buildbot-0.8.2_hg_8a9e33843c3f_production_0.8-py2.7.egg/buildbot/scripts/checkconfig.py", line 31, in __init__
    self.loadConfig(configFile, check_synchronously_only=True)
  File "/builds/buildbot/tests_scheduler/lib/python2.7/site-packages/buildbot-0.8.2_hg_8a9e33843c3f_production_0.8-py2.7.egg/buildbot/master.py", line 652, in loadConfig
    exec f in localDict
  File "/builds/buildbot/tests_scheduler/master/master.cfg", line 8, in <module>
    import thunderbird_config
  File "/tmp/tmpfmzxkW/thunderbird_config.py", line 59, in <module>
KeyError: 'env'
make: *** [checkconfig] Error 1

https://hg.mozilla.org/build/buildbot-configs/rev/a0a864fa9f84

Comment 7

[Chris Cooper [:coop] (he/him)]

Merged to production, and deployed.

Comment 8

[Mark Banner (:standard8)]

We fixed this enough that we're good for now. There was another bug that disabled 10.6 MozMill builders, pending mozharness transition which is another bug.