Bug 113191 - master.cfg fine-tuning for Qt Mountain Lion Release bot
Summary: master.cfg fine-tuning for Qt Mountain Lion Release bot
Status: RESOLVED FIXED
Alias: None
Product: WebKit
Classification: Unclassified
Component: New Bugs (show other bugs)
Version: 528+ (Nightly build)
Hardware: All All
: P2 Normal
Assignee: Csaba Osztrogonác
URL:
Keywords: Qt, QtTriaged
Depends on: 113287
Blocks:
  Show dependency treegraph
 
Reported: 2013-03-25 06:04 PDT by Csaba Osztrogonác
Modified: 2013-04-02 23:53 PDT (History)
6 users (show)

See Also:


Attachments
Patch (4.80 KB, patch)
2013-03-25 06:25 PDT, Csaba Osztrogonác
no flags Details | Formatted Diff | Diff
Patch (4.96 KB, patch)
2013-03-25 06:31 PDT, Csaba Osztrogonác
no flags Details | Formatted Diff | Diff
Patch (4.80 KB, patch)
2013-03-26 03:45 PDT, Csaba Osztrogonác
no flags Details | Formatted Diff | Diff

Note You need to log in before you can comment on or make changes to this bug.
Description Csaba Osztrogonác 2013-03-25 06:04:22 PDT
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.
Comment 1 Csaba Osztrogonác 2013-03-25 06:25:35 PDT
Created attachment 194837 [details]
Patch
Comment 2 Csaba Osztrogonác 2013-03-25 06:29:46 PDT
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?
Comment 3 Csaba Osztrogonác 2013-03-25 06:31:40 PDT
Created attachment 194839 [details]
Patch
Comment 4 Csaba Osztrogonác 2013-03-25 06:34:41 PDT
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.
Comment 5 Lucas Forschler 2013-03-25 09:02:13 PDT
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.
Comment 6 Csaba Osztrogonác 2013-03-25 09:53:51 PDT
(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
Comment 7 Lucas Forschler 2013-03-25 10:49:53 PDT
I've changed indt-mountainlion to oslo-mountainlion in the passwords.json file.
this should be picked up when the master is restarted.
Comment 8 Ryosuke Niwa 2013-03-25 11:23:00 PDT
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.
Comment 9 Csaba Osztrogonác 2013-03-25 11:33:03 PDT
(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?
Comment 10 Ryosuke Niwa 2013-03-25 11:39:37 PDT
Personally, I don't really care about blank lines and other random PEP8 style requirements.
Comment 11 Csaba Osztrogonác 2013-03-26 03:45:26 PDT
Created attachment 195051 [details]
Patch
Comment 12 Csaba Osztrogonác 2013-03-26 03:46:15 PDT
(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
Comment 13 Build Bot 2013-03-26 07:28:36 PDT
Comment on attachment 195051 [details]
Patch

Attachment 195051 [details] did not pass win-ews (win):
Output: http://webkit-commit-queue.appspot.com/results/17220945
Comment 14 Csaba Osztrogonác 2013-03-26 07:30:32 PDT
Comment on attachment 195051 [details]
Patch

remove cq-, this patch can't break a layout test on Windows. :)
Comment 15 Csaba Osztrogonác 2013-03-27 08:42:45 PDT
Comment on attachment 195051 [details]
Patch

Clearing flags on attachment: 195051

Committed r146989: <http://trac.webkit.org/changeset/146989>
Comment 16 Csaba Osztrogonác 2013-03-27 08:42:50 PDT
All reviewed patches have been landed.  Closing bug.
Comment 17 Csaba Osztrogonác 2013-03-27 08:50:47 PDT
It seem build.webkit.org automatic restart doesn't work now. Could you restart it, please?
Comment 18 Ryosuke Niwa 2013-04-02 23:53:01 PDT
(In reply to comment #17)
> It seem build.webkit.org automatic restart doesn't work now. Could you restart it, please?

Done that.