Skip to content

config: add config-production-thunderbird.toml (bug 2012575)#83

Merged
shtrom merged 6 commits intomainfrom
bug2012575/thunderbird-worker
Mar 12, 2026
Merged

config: add config-production-thunderbird.toml (bug 2012575)#83
shtrom merged 6 commits intomainfrom
bug2012575/thunderbird-worker

Conversation

@shtrom
Copy link
Member

@shtrom shtrom commented Mar 3, 2026

  • Add configuration for thunderbird worker
  • Cover thunderbird and firefox config in tests (and make noop fx config pass the tests)
  • Add config-suite.toml to gitignore

@shtrom
Copy link
Member Author

shtrom commented Mar 3, 2026

@coreycb if you want to have a look at the suggested mappings

This comment was marked as abuse.

@mozilla-conduit mozilla-conduit deleted a comment from Copilot AI Mar 3, 2026
@mozilla-conduit mozilla-conduit deleted a comment from Copilot AI Mar 3, 2026
@mozilla-conduit mozilla-conduit deleted a comment from Copilot AI Mar 3, 2026
Copy link

@coreycb coreycb left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks! Generally looks good to me. I left a couple of comments, but they are probably just areas that I need clarity on and not actual issues.

@shtrom shtrom force-pushed the bug2012575/thunderbird-worker branch from e35c411 to f9c3cfd Compare March 3, 2026 03:35
# destination_url = "ssh://hg.mozilla.org/releases/comm-release/"
# ESR
# tag_pattern = "^(THUNDERBIRD)_(\\d+)(_\\d+)+esr_(BUILD\\d+|RELEASE)$"
# destination_url = "ssh://hg.mozilla.org/releases/comm-esr\\2/"
Copy link

@coreycb coreycb Mar 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there be a tag_pattern for comm-central?

Do the tag_patterns only include tags from the corresponding git branch?
I think the following would cover tags, assuming only tags from the corresponding git branches are included:

https://hg-edge.mozilla.org/comm-central/tags

(NIGHTLY)_(\d+)_(BASE|END)
(BETA)_(\d+)_(BASE|END)

https://hg-edge.mozilla.org/releases/comm-beta/tags

(NIGHTLY)_(\d+)_(BASE|END)
(BETA)_(\d+)_(BASE|END)
(RELEASE)_(\d+)_(BASE|END)
^(THUNDERBIRD)_(\\d+)_0b(\\d+)_(BUILD\\d+|RELEASE)$  # beta tags

https://hg-edge.mozilla.org/releases/comm-release/tags

(NIGHTLY)_(\d+)_(BASE|END)
(BETA)_(\d+)_(BASE|END)
(RELEASE)_(\d+)_(BASE|END)
^(THUNDERBIRD)_(\\d+)_0b(\\d+)_(BUILD\\d+|RELEASE)$  # beta tags
^(THUNDERBIRD)_(\\d+)(_\\d+)+_(BUILD\\d+|RELEASE)$  # release tags

https://hg-edge.mozilla.org/releases/comm-esr140/tags

(NIGHTLY)_(\d+)_(BASE|END)
(BETA)_(\d+)_(BASE|END)
(RELEASE)_(\d+)_(BASE|END)
(ESR)_(\d+)_(BASE|END)
^(THUNDERBIRD)_(\\d+)_0b(\\d+)_(BUILD\\d+|RELEASE)$  # beta tags
^(THUNDERBIRD)_(\\d+)(_\\d+)+esr_(BUILD\\d+|RELEASE)$  # esr tags

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should there be a tag_pattern for comm-central?

It will get .+ to get all tags.

Do the tag_patterns only include tags from the corresponding git branch?

The logic is less smart^W^Wmore flexible: we need to explicitly list all the tag patterns that we want to go to a given repo. This is regardless of whether the commit is on a matching branch for that repo. In case it isn't (because we didn't write this config file correctly), Hg will ignore the tag, and it will simply not be created on the target repo.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@coreycb Thanks for the updated mapping. I've pushed an updated config (note: it's only comments for now, as it doesn't apply to infra-testing, but it's good to capture and discuss this early nonetheless).

I have put in simpler (less specific) regexps, but I think they should achieve the same. Two things to note:

  • most repos have some ^(NIGHTLY|BETA|RELEASE) tags, but they are inherited from merges or forks (e.g, esr140 doesn't have the most recent ones)
  • I can't include them all for the ESR, as we use the tags to determine the target repo. For Firefox, only the esr versions are used, though I might had to add support for ESR_ here, too. I'm not completely sure how well this will work.

-> Is the ESR_nnn_BASE tag used in any downstream automation?

Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

-> Is the ESR_nnn_BASE tag used in any downstream automation?

It doesn't look like it. @dandarnell can you check too?

Copy link
Member

@cgsheeh cgsheeh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

FYI there are whitespace-only changes in config-suite.toml in this PR, not sure if that was intentional.

#
# MOZILLA-UNIFIED
#
# We don't sync to this repository, but we put it here first to fetch all
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Perhaps we could build that into a separate config like refs_fetch_source instead of shoe-horning it into branch_mappings?

Copy link
Member Author

@shtrom shtrom Mar 10, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That's a good idea! I'll file a bug.

https://bugzilla.mozilla.org/show_bug.cgi?id=2022092

Though, thinking more about it, maybe we don't need it so much, now that we have bundles setup for those repos, too.

@shtrom
Copy link
Member Author

shtrom commented Mar 10, 2026

FYI there are whitespace-only changes in config-suite.toml in this PR, not sure if that was intentional.

Oh, I missed that... config-suite should be gone. Added to gitignore.

@shtrom shtrom merged commit 3564843 into main Mar 12, 2026
1 check passed
@shtrom shtrom deleted the bug2012575/thunderbird-worker branch March 12, 2026 01:19
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants