1682059 - tbirdbld-merge user for Thunderbird merge automation

Status: RESOLVED FIXED

(Developer Services :: Mercurial: hg.mozilla.org, task)

Description

[Rob Lemley [:rjl]]

This is for Thunderbird merge automation work, using the same setup that Firefox uses.

We'll need a user set up on hg.mo that mirrors ffxbld-merge, but with permissions like tbirdbld. The keys then go into sops+cloudops-infra so they can be deployed on the Thunderbird treescript workers. (How does that normally happen?)

There's also the merge_day.py hook on the mozilla repos. Ideally we would set up something similar for the comm repos, but looking at it we'd need a comm-unified repo. I'm not quite ready to travel down that path because of bug 1666242.

Comment 1

[Rob Lemley [:rjl]]

It occurred to me late last night that we do not actually need a comm-unified repo to do the commit checks in merge_day.py.

The actual merge work where the commit hash checks are necessary is for comm-central -> comm-beta. So, we can just check comm-central for the hashes. (At least I think that would work.) There is no comm-release anymore, and esr merges really don't happen.. maybe once or twice at the beginning of a new esr version.

I'll fork merge_day.py into a Thunderbird specific version today. What else do we need to move this bug forward?

Comment 2

[Rob Lemley [:rjl]]

Attachment: Bug 1682059 - Add support for Thunderbird repos to merge_day hook. r=sheehan

Comment 3

[Connor Sheehan [:sheehan]]

(In reply to Rob Lemley [:rjl] from comment #1)

What else do we need to move this bug forward?

Historically merge automation has been managed by Releng. I would speak with them about how the Firefox merge automation user is set up. In my experience you'll need to file an LDAP bug to create the new user. No idea about setting up keys in sops with CloudOps (again, it's likely Releng can help you there) :)

Comment 4

[Rob Lemley [:rjl]]

(In reply to Connor Sheehan [:sheehan] from comment #3)

In my experience you'll need to file an LDAP bug to create the new user.

Bug 1687414.

Comment 5

[Rob Lemley [:rjl]]

Attachment: Bug 1682059 - Tests for Thunderbird merge-day hook support. r=sheehan

Depends on D102225

Comment 6

[Aki Sasaki (not active)]

Should we land these now?
What do we need to do to roll these out?

Comment 7

[Connor Sheehan [:sheehan]]

(In reply to Aki Sasaki [:aki] (he/him) from comment #6)

Should we land these now?
What do we need to do to roll these out?

I can land and deploy Monday morning (or some other time that's more convenient). I thought it was a good idea to wait for the new user to exist before deploying these patches. :)

Comment 8

[Aki Sasaki (not active)]

Whenever you have time is great, thank you!

(I think landing before could have worked; I don't think it would have caused any problems if you referenced a yet-uncreated account. Now that it's created, this is the only thing we're waiting for.)

Comment 9

[Pulsebot]

Pushed by [e-mail]:
https://hg.mozilla.org/hgcustom/version-control-tools/rev/d779aa6bc11d
Add support for Thunderbird repos to merge_day hook. r=sheehan
https://hg.mozilla.org/hgcustom/version-control-tools/rev/3aaf450ef0b0
Tests for Thunderbird merge-day hook support. r=sheehan

Comment 10

[Connor Sheehan [:sheehan]]

This is deployed now - let me know if anything looks awry.

Comment 11

[Aki Sasaki (not active)]

Thanks!