1117637 - plugins and extensions moved to wrong directory by buildbotcustom

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Hiroyuki Ikezoe (:hiro)]

Mozmill tests on comm-central for MacOSX has still failed.

From a failure log:
sh -c 'if [ ! -d ./Daily.app/Contents/MacOS/plugins ]; then mkdir ./Daily.app/Contents/MacOS/plugins; fi && if [ ! -d ./Daily.app/Contents/MacOS/extensions ]; then mkdir ./Daily.app/Contents/MacOS/extensions; fi && cp -R bin/plugins/* ./Daily.app/Contents/MacOS/plugins/ && if [ -d extensions ]; then cp -R extensions/* ./Daily.app/Contents/MacOS/extensions/; fi'

The plugins path should be Contents/Resources.

Comment 1

[Mark Banner (:standard8)]

MozMill doesn't currently use mozharness (which the other bug changed), so this needs this section of code changing:

http://hg.mozilla.org/build/buildbotcustom/annotate/c5fc38e6fc3e/process/factory.py#l5009

Comment 2

[Philipp Kewisch [:Fallen][📱📆]]

Attachment: Fix - v1

This should take care. Not sure to pick as a reviewer, so I picked somebody random that has reviews in this component. Please forward if someone else is a better pick.

Comment 3

[Philipp Kewisch [:Fallen][📱📆]]

Attachment: buildbotcustom changes - v2

I realized we might need to differentiate per gecko version like in the patch for mozharness xpcshell. This patch does that using platform config. I will attach another patch in a moment with the buildbot-configs changes.

Comment 4

[Philipp Kewisch [:Fallen][📱📆]]

Attachment: buildbot-configs changes - v1

Comment 5

[Pete Moore [:pmoore][:pete]]

Comment on attachment 8550784 [details] [diff] [review]
buildbotcustom changes - v2

(In reply to Philipp Kewisch [:Fallen] from comment #2)
> Created attachment 8550755 [details] [diff] [review]
> Fix - v1
> 
> This should take care. Not sure to pick as a reviewer, so I picked somebody
> random that has reviews in this component. Please forward if someone else is
> a better pick.

Thanks Fallen. Let's see if catlee can help, otherwise maybe armenzg, bhearsum, kmoir, jlund might be good reviewers for buildbot internals. I'm asking catlee first as a) he landed me three reviews on Friday :p, and b) he also has an awesome standing on https://github.com/mozilla/build-buildbotcustom/graphs/contributors. I'm not so hot in this area.

Catlee if you're busy etc maybe you can pass it onto one of the others?

Thanks!
Pete

Comment 6

[Chris AtLee [:catlee]]

Comment on attachment 8550784 [details] [diff] [review]
buildbotcustom changes - v2

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

I think this looks ok.

::: process/factory.py
@@ +4753,5 @@
> +        # OSX 10.9.5+ requires putting extensions and plugins into
> +        # Contents/Resources, this property sets up that directory.
> +        def get_xredir(build):
> +            if self.platform.startswith("macosx"):
> +                exedir = os.path.dirname(build.getProperty('exepath'))

can you use get_exedir(build) here too?

Comment 7

[Chris AtLee [:catlee]]

Comment on attachment 8550785 [details] [diff] [review]
buildbot-configs changes - v1

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

::: mozilla-tests/config.py
@@ +2239,5 @@
> +    if platform != 'macosx64':
> +        continue
> +    for name, branch in items_before(BRANCHES, 'gecko_version', 34):
> +      if 'macosx64' in BRANCHES[name]['platforms']:
> +        BRANCHES[name]['platforms']['macosx64']['mac_res_subdir'] = 'MacOS'

I don't think your outer loop is doing anything. Can this be better written as:

for name, branch in items_before(BRANCHES, 'gecko_version', 34):
  if 'macosx64' in BRANCHES[name]['platforms']:
    BRANCHES[name]['platforms']['macosx64']['mac_res_subdir'] = 'MacOS'

Comment 8

[Philipp Kewisch [:Fallen][📱📆]]

Attachment: buildbot-configs changes - v2

You are right, it should be the same thing. Here is an updated patch.

Comment 9

[Philipp Kewisch [:Fallen][📱📆]]

Attachment: buildbotcustom changes - v3

Comment 10

[Philipp Kewisch [:Fallen][📱📆]]

https://hg.mozilla.org/build/buildbot-configs/rev/998d8b909278
https://hg.mozilla.org/build/buildbotcustom/rev/e5ba4d00f5d5

Comment 11

[Philipp Kewisch [:Fallen][📱📆]]

Merged to production and is live. Thanks all!