898099 - Switch release_repacks.sh to run on our Windows 64 builders

Status: RESOLVED FIXED

(Release Engineering :: Release Automation, defect, P1)

Description

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

We _really_ don't want to support our 32-bit windows builders for another ESR cycle. 

The only job of substance that still runs on these machines is the release repack builders for mozilla-beta and mozilla-release.

Comment 1

[[e-mail] (:bhearsum)]

I was hoping this would be fixed by bug 740142...I don't know if it's going to make it in time though...

Comment 2

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

(In reply to Ben Hearsum [:bhearsum] from comment #1)
> I was hoping this would be fixed by bug 740142...I don't know if it's going
> to make it in time though...

Yeah, me too.

In the interim, I've got the release repack builders running in staging and am iterating on the steps to get the mar tools built on win64.

Comment 3

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

We already build and upload the mar tools for betas, so the first step is change the upload env for release builds to set the tinderbox builds dir (gives us the platform), and then change post_upload.py to put the mar tools in the platform-specific dir for candidates so the repack script can download them instead of building them.

We'll still need to run |make configure|, and for that we'll need to start using the in-tree mozconfigs for beta/release. Once we get |make configure| running successfully on win64, the rest of the process should just work (ha!).

Comment 4

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

Attachment: Move mar tools to platform-specific dirs for release candidates

Comment 5

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

Attachment: Set upload_dir for releases (gives us platform for post_upload.py)

Comment 6

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

Attachment: Download mar tools from candidates dir

Comment 7

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

Comment on attachment 782069 [details] [diff] [review]
Set upload_dir for releases (gives us platform for post_upload.py)

https://hg.mozilla.org/build/buildbotcustom/rev/40474423ae55

Comment 8

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

Comment on attachment 782068 [details] [diff] [review]
Move mar tools to platform-specific dirs for release candidates

https://hg.mozilla.org/build/tools/rev/a039a18a3a38

Comment 9

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

Comment on attachment 782068 [details] [diff] [review]
Move mar tools to platform-specific dirs for release candidates

$ svn ci -m "Bug 898099 - Move mar tools to platform-specific dirs for release candidates - r=armenzg"
Sending        bin/post_upload.py
Transmitting file data .
Committed revision 72738.

Comment 10

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

(In reply to Chris Cooper [:coop] from comment #7)
> Comment on attachment 782069 [details] [diff] [review]
> Set upload_dir for releases (gives us platform for post_upload.py)
> 
> https://hg.mozilla.org/build/buildbotcustom/rev/40474423ae55

In production.

Comment 11

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

Attachment: Use win64 slaves for beta win32 repacks

Comment 12

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

Attachment: Download mar tools from candidates dir, v2

Comment 13

[Aki Sasaki (not active)]

Comment on attachment 787336 [details] [diff] [review]
Download mar tools from candidates dir, v2

Is this going to bite us on release/esr?  I know you've done a lot of testing, but 23.0.1 is around the corner.

Comment 14

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

Comment on attachment 787336 [details] [diff] [review]
Download mar tools from candidates dir, v2

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

::: lib/python/build/l10n.py
@@ +63,5 @@
>                      path.join(sourceRepoName, ".mozconfig"))
>      else:
>          shutil.copy(mozconfigPath, path.join(sourceRepoName, ".mozconfig"))
> +    with open(path.join(sourceRepoName, ".mozconfig"), "a") as mozconfig:
> +        mozconfig.write("ac_add_options --enable-official-branding")

This avoids us having to land changes to the l10n-mozconfigs on beta. If we can safely land this l10n-mozconfig change on m-c/aurora/beta/release, we should.

@@ +142,5 @@
>      env['MBSDIFF'] = mbsdiff
>  
> +    log.info("Download mar tools")
> +    if stageServer:
> +        if not path.isfile(msys2windows(mar)):

All path operations on Windows expect a "E:\builds\..." style path, hence the msys2windows() function.

@@ +165,5 @@
> +        log.warning('stageServer not set. mar tools will *not* be downloaded.')
> +
> +    compareLocales(compareLocalesRepo, locale, l10nRepoDir, localeSrcDir,
> +                   l10nIni, revision=revision, merge=merge)
> +    run_cmd(make + ["installers-%s" % locale], cwd=localeSrcDir, env=env)

Need to download mar tools before running |make installers|

Comment 15

[Aki Sasaki (not active)]

Comment on attachment 787336 [details] [diff] [review]
Download mar tools from candidates dir, v2

resetting flag :)

Comment 16

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

(In reply to Aki Sasaki [:aki] from comment #13)
> Comment on attachment 787336 [details] [diff] [review]
> Download mar tools from candidates dir, v2
> 
> Is this going to bite us on release/esr?  I know you've done a lot of
> testing, but 23.0.1 is around the corner.

I haven't done any testing on release or esr yet. Thunderbird is also unknown.

Comment 17

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

Comment on attachment 787334 [details] [diff] [review]
Use win64 slaves for beta win32 repacks

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

Comment 18

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

Comment on attachment 787336 [details] [diff] [review]
Download mar tools from candidates dir, v2

https://hg.mozilla.org/build/tools/rev/15c4d43e63bd

Comment 19

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

https://hg.mozilla.org/build/buildbotcustom/rev/0dbdc585e3ef

Comment 20

[Rail Aliiev [:rail]]

Attachment: tooltool fixes

Comment 21

[Rail Aliiev [:rail]]

Attachment: tooltool.diff

linux64 for some reason lost one of the changes.

Comment 22

[Rail Aliiev [:rail]]

Comment on attachment 788908 [details] [diff] [review]
tooltool.diff

remote:   https://hg.mozilla.org/build/buildbot-configs/rev/995d48da2151
remote:   https://hg.mozilla.org/build/buildbot-configs/rev/09ea65224f2e

Comment 23

[Rail Aliiev [:rail]]

done

Comment 24

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

In production.