Bug 113191 – master.cfg fine-tuning for Qt Mountain Lion Release bot

• Status: RESOLVED
• Resolution: FIXED
• Component: New Bugs

[Csaba Osztrogonác]

Qt Mountain Lion Release will be changed soon. Previously it was a build-only
save, but we'd like to have a build and WebKit2 tester slave instead of it.

The new slave have been working fine here for ~2.5 months: 
http://build.webkit.sed.hu/builders/x86-64%20Mountain%20Lion%20Qt%20Release%20%28WebGL%20Tester%29

It needs some minor master.cfg changes, so patch is coming soon.

[Csaba Osztrogonác]

Created attachment 194837 [details]
Patch

[Csaba Osztrogonác]

Comment on attachment 194837 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=194837&action=review

> Tools/BuildSlaveSupport/build.webkit.org-config/config.json:47
> -                    { "name": "indt-mountainlion", "platform": "qt-mac"},
> +                    { "name": "oslo-mountainlion", "platform": "qt-5.0-mac-wk2"},

The builder name changes because of the bot location change.
Lucas, could you change the builder name in password.json too, please?

[Csaba Osztrogonác]

Created attachment 194839 [details]
Patch

[Csaba Osztrogonác]

note: When touching the master.cfg, I found some annoying whitespaces
and outdated platform infos for Qt bots - https://bugs.webkit.org/show_bug.cgi?id=113195

I fixed them too and it would be great landing the 2 patches 
in one shot to avoid too frequent master restart.

[Lucas Forschler]

I was out on vacation last week.  Do you still need me to update the password.json file?  If so, I will be in the office later today.

[Csaba Osztrogonác]

(In reply to comment #5)
> I was out on vacation last week.  Do you still need me to update the password.json file?  If so, I will be in the office later today.

Yes, it is a brand new bug, I filed it ~3 hours before. :)
But it would be great to synchronize the password.json update with landing 
the proposed patch not to cause problem for build.webkit.org

[Lucas Forschler]

I've changed indt-mountainlion to oslo-mountainlion in the passwords.json file.
this should be picked up when the master is restarted.

[Ryosuke Niwa]

Comment on attachment 194839 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=194839&action=review

> Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:607
> +        if self.getProperty('fullPlatform').endswith("-wk2"):
> +            testDirectory = "WebKitBuild/%s/Source/WebKit2/UIProcess/API/qt/tests/" % self.getProperty('configuration').title()
> +        else:
> +            testDirectory = "WebKitBuild/%s/Source/WebKit/qt/tests/" % self.getProperty('configuration').title()
> +

Can we do this detection in run-qtwebkit-tests instead?

> Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:870
>  
> +class BuildAndTestWebKit2Factory(BuildAndTestFactory):
> +    CompileClass = CompileWebKit
> +    TestClass = RunWebKit2Tests
> +

We try to use PEP8 style, which means we want to spaces between class declarations.

[Csaba Osztrogonác]

(In reply to comment #8)
> (From update of attachment 194839 [details])
> View in context: https://bugs.webkit.org/attachment.cgi?id=194839&action=review
> 
> > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:607
> > +        if self.getProperty('fullPlatform').endswith("-wk2"):
> > +            testDirectory = "WebKitBuild/%s/Source/WebKit2/UIProcess/API/qt/tests/" % self.getProperty('configuration').title()
> > +        else:
> > +            testDirectory = "WebKitBuild/%s/Source/WebKit/qt/tests/" % self.getProperty('configuration').title()
> > +
> 
> Can we do this detection in run-qtwebkit-tests instead?

Good point. :) I think it would make 
run-qtwebkit-tests more user friendly.

> > Tools/BuildSlaveSupport/build.webkit.org-config/master.cfg:870
> >  
> > +class BuildAndTestWebKit2Factory(BuildAndTestFactory):
> > +    CompileClass = CompileWebKit
> > +    TestClass = RunWebKit2Tests
> > +
> 
> We try to use PEP8 style, which means we want to spaces between class declarations.

Correct. Will fix. It seems there are many similar bug in master.cfg.
Shall I fix them in a separated bug? For example in https://bugs.webkit.org/show_bug.cgi?id=113195?

[Ryosuke Niwa]

Personally, I don't really care about blank lines and other random PEP8 style requirements.

[Csaba Osztrogonác]

Created attachment 195051 [details]
Patch

[Csaba Osztrogonác]

(In reply to comment #11)
> Created an attachment (id=195051) [details]
> Patch

It can be landed after the patch landed from https://bugs.webkit.org/show_bug.cgi?id=113287

[Build Bot]

Comment on attachment 195051 [details]
Patch

Attachment 195051 [details] did not pass win-ews (win):
Output: http://webkit-commit-queue.appspot.com/results/17220945

[Csaba Osztrogonác]

Comment on attachment 195051 [details]
Patch

remove cq-, this patch can't break a layout test on Windows. :)

[Csaba Osztrogonác]

Comment on attachment 195051 [details]
Patch

Clearing flags on attachment: 195051

Committed r146989: <http://trac.webkit.org/changeset/146989>

[Csaba Osztrogonác]

All reviewed patches have been landed.  Closing bug.

[Csaba Osztrogonác]

It seem build.webkit.org automatic restart doesn't work now. Could you restart it, please?

[Ryosuke Niwa]

(In reply to comment #17)
> It seem build.webkit.org automatic restart doesn't work now. Could you restart it, please?

Done that.