911803 - Cleanup Windows builds and tests display a bit

Status: RESOLVED FIXED

(Tree Management Graveyard :: TBPL, defect)

Description

[Ryan VanderMeulen [:RyanVM]]

Windows x64 builds are no more Windows 7 than the x86 builds are. Since there is no intention of testing x64 builds on anything other than the Server 2012 VMs, I propose combining them into one line.

Comment 1

[Ryan VanderMeulen [:RyanVM]]

As a note, comm-central also does Windows x64 builds, but doesn't run tests on them.

Comment 2

[Ryan VanderMeulen [:RyanVM]]

Attachment: Merge Windows x64 builds and tests into one line

This has the added benefit of grouping all the 32bit builds together and putting the x64 builds below them instead of wedging them in between Win7 and Win8.

Comment 3

[Ryan VanderMeulen [:RyanVM]]

Attachment: Merge Windows x64 builds and tests into one line

With some more regex cleanups

Comment 4

[Ryan VanderMeulen [:RyanVM]]

Attachment: Put Windows 32bit builds on the WinXP line

And now for the more controversial one. I would argue that Win Server 2k3 has more in common with XP than 7 (NT 5 kernel and such). Therefore, let's display it on the line with the platform it's more akin to like we do for everything else.

This also includes some regex cleanups for job names that are long-gone.

Comment 5

[Ryan VanderMeulen [:RyanVM]]

And on an aside, how silly that the Win8 ix slaves still use WINNT 6.2 as the job name when all the others use the full Windows name.

Comment 6

[Ryan VanderMeulen [:RyanVM]]

Attachment: Add comments separating the different OSes in the regex

Borrowing the idea from the type block below. Not really the right bug for this, but I didn't feel like putting it in bug 911248 at this point and another bug for it seemed silly.

Comment 7

[Ryan VanderMeulen [:RyanVM]]

BTW, I figure that while some of these changes will take some getting used to, we might as well make them at the same time as the ones from bug 911248 so that it only requires one departure from what we knew from before :)

Comment 8

[Ed Morley [:emorley]]

Comment on attachment 798560 [details] [diff] [review]
Merge Windows x64 builds and tests into one line

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

'win8' and '-xp-' etc are required for the jetpack job names (they annoyingly have their own scheme).

Comment 9

[Ed Morley [:emorley]]

Comment on attachment 798561 [details] [diff] [review]
Put Windows 32bit builds on the WinXP line

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

Diff is unclear since seems to be making some of the same changes as patch 1 - don't suppose you can rebase? :-)

Comment 10

[Ryan VanderMeulen [:RyanVM]]

Argh, stupid Jetpack tree. Thanks for pointing that out.

Comment 11

[Ryan VanderMeulen [:RyanVM]]

Attachment: Merge Windows x64 builds and tests into one line

Now with less Jetpack bustage.

Comment 12

[Ryan VanderMeulen [:RyanVM]]

Attachment: Put Windows 32bit builds on the WinXP line

Comment 13

[Ed Morley [:emorley]]

Unfortunately the diffs don't apply (just want to test quickly) - can you fix patch #2? :-)

Comment 14

[Ryan VanderMeulen [:RyanVM]]

Attachment: Add comments separating the different OSes in the regex

Sorry, that's because I put the comment patch at the front. Put this in front and the other two should apply fine.

Comment 15

[Ryan VanderMeulen [:RyanVM]]

\m/

https://hg.mozilla.org/webtools/tbpl/rev/cdb0b9ca1162
https://hg.mozilla.org/webtools/tbpl/rev/9687c7def241
https://hg.mozilla.org/webtools/tbpl/rev/db9e904c9ed7

Comment 16

[Ed Morley [:emorley]]

Thank you for all these + the other bug :-)

Comment 17

[Ryan VanderMeulen [:RyanVM]]

Attachment: Re-arrange Windows regex conditions for consistency

One more minor change. I personally found the various Windows regex conditions to be a bit hard to parse from version to version. This just re-arranges them so that as much as possible, the conditions are in the same order for each version.

Comment 18

[Ryan VanderMeulen [:RyanVM]]

Thanks :)

https://hg.mozilla.org/webtools/tbpl/rev/aa98f198b7d3

Comment 19

[Ed Morley [:emorley]]

In production :-)