Skip to content

config: merge all prod config back into a single file (bug 2024547) #85

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
shtrom merged 2 commits into from
Mar 30, 2026
Merged

config: merge all prod config back into a single file (bug 2024547) #85

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f9eedd7
config: merge all prod config back into a single file (bug 2024547)
shtrom Mar 20, 2026
50c6018
config: change queue name for other workers
shtrom Mar 30, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions config-production-firefox.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ userid = "SET THIS IN PULSE_USERID ENV VARIABLE"
password = "SET THIS IN PULSE_PASSWORD ENV VARIABLE"
# The exchange is declared by the Producer.
exchange = "exchange/landoprod/pushes"
routing_key = "gitpushes"
routing_key = "gitpushes.firefox"
# The Consumer declares the queue and binds it to the exchange.
heartbeat = 30
queue = "queue/githgsyncprod/pushes"
queue = "queue/githgsyncprod/pushes.firefox"

[sentry]
sentry_dsn = ""
Expand All @@ -24,7 +24,7 @@ directory = "/clones"

[[tracked_repositories]]
name = "firefox"
url = "https://github.com/mozilla-firefox/firefox.git_NOT_YET_IN_USE"
url = "https://github.com/mozilla-firefox/firefox.git_NOT_IN_USE"


#
Expand All @@ -34,13 +34,13 @@ url = "https://github.com/mozilla-firefox/firefox.git_NOT_YET_IN_USE"
# references early, with the benefit of bundles.
#
[[branch_mappings]]
source_url = "https://github.com/mozilla-firefox/firefox.git_NOT_YET_IN_USE"
source_url = "https://github.com/mozilla-firefox/firefox.git_NOT_IN_USE"
branch_pattern = "THIS_SHOULD_MATCH_NOTHING"
destination_url = "https://hg.mozilla.org/mozilla-unified/"
destination_branch = "NOT_A_VALID_BRANCH"

[[tag_mappings]]
source_url = "https://github.com/mozilla-firefox/firefox.git_NOT_YET_IN_USE"
source_url = "https://github.com/mozilla-firefox/firefox.git_NOT_IN_USE"
tag_pattern = "THIS_SHOULD_MATCH_NOTHING"
destination_url = "https://hg.mozilla.org/mozilla-unified/"
tags_destination_branch = "NOT_A_VALID_BRANCH"
Expand Down
48 changes: 9 additions & 39 deletions config-production-thunderbird.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ userid = "SET THIS IN PULSE_USERID ENV VARIABLE"
password = "SET THIS IN PULSE_PASSWORD ENV VARIABLE"
# The exchange is declared by the Producer.
exchange = "exchange/landoprod/pushes"
routing_key = "gitpushes"
routing_key = "gitpushes.thunderbird"
# The Consumer declares the queue and binds it to the exchange.
heartbeat = 30
queue = "queue/githgsyncprod/pushes"
queue = "queue/githgsyncprod/pushes.thunderbird"

[sentry]
sentry_dsn = ""
Expand All @@ -24,7 +24,8 @@ directory = "/clones"

[[tracked_repositories]]
name = "thunderbird-infra-testing"
url = "https://github.com/thunderbird/infra-testing.git"
url = "https://github.com/thunderbird/infra-testing.git_NOT_IN_USE"


#
# COMM-UNIFIED
Expand All @@ -33,46 +34,15 @@ url = "https://github.com/thunderbird/infra-testing.git"
# references early, with the benefit of bundles.
#
[[branch_mappings]]
source_url = "https://github.com/thunderbird/infra-testing.git"
source_url = "https://github.com/thunderbird/infra-testing.git_NOT_IN_USE"
branch_pattern = "THIS_SHOULD_MATCH_NOTHING"
destination_url = "https://hg.mozilla.org/comm-unified/"
destination_branch = "NOT_A_VALID_BRANCH"

[[branch_mappings]]
source_url = "https://github.com/thunderbird/infra-testing.git"
branch_pattern = "main"
destination_url = "ssh://hg.mozilla.org/conduit-testing/comm-infra-testing/"
destination_branch = "default"

[[tag_mappings]]
source_url = "https://github.com/thunderbird/infra-testing.git"

# comm-central:
# tag_pattern = ".+"
# destination_url = "ssh://hg.mozilla.org/comm-central"
# tags_destination_branch = "tags-testing"

# comm-beta:
# tag_pattern = "(^THUNDERBIRD|NIGHTLY|BETA|RELEASE)_.*$"
# destination_url = "ssh://hg.mozilla.org/releases/comm-beta/"
# tags_destination_branch = "tags-unified"

# comm-release:
# tag_pattern = "(^THUNDERBIRD|NIGHTLY|BETA|RELEASE)_.*$"
# destination_url = "ssh://hg.mozilla.org/releases/comm-release/"
# tags_destination_branch = "tags-unified"

# comm-esrXXX
# tag_pattern = "^(THUNDERBIRD)_(\\d+)(_\\d+)+esr_(BUILD\\d+|RELEASE)$"
# destination_url = "ssh://hg.mozilla.org/releases/comm-esr\\2/"
# tags_destination_branch = "tags-unified"
# ...
# tag_pattern = "^ESR_(\\d+)_BASE$"
# destination_url = "ssh://hg.mozilla.org/releases/comm-esr\\1/"
# tags_destination_branch = "tags-unified"

tag_pattern = ".+"
destination_url = "ssh://hg.mozilla.org/conduit-testing/comm-infra-testing/"
tags_destination_branch = "tags-testing"
source_url = "https://github.com/thunderbird/infra-testing.git_NOT_IN_USE"
tag_pattern = "THIS_SHOULD_MATCH_NOTHING"
destination_url = "https://hg.mozilla.org/comm-unified/"
tags_destination_branch = "NOT_A_VALID_BRANCH"
# Default
#tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
66 changes: 63 additions & 3 deletions config-production.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,9 +146,9 @@ destination_url = "ssh://hg.mozilla.org/releases/mozilla-release/"
destination_branch = "\\1"


#################
# INFRA-TESTING #
#################
###########################
# (FIREFOX) INFRA-TESTING #
###########################

[[tracked_repositories]]
name = "infra-testing"
Expand Down Expand Up @@ -191,6 +191,66 @@ tags_destination_branch = "tags-testing"
#tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"


#############################
# THUNDERBIRD-INFRA-TESTING #
#############################

[[tracked_repositories]]
name = "thunderbird-infra-testing"
url = "https://github.com/thunderbird/infra-testing.git"

#
# COMM-UNIFIED
#
# We don't sync to this repository, but we put it here first to fetch all
# references early, with the benefit of bundles.
#
[[branch_mappings]]
source_url = "https://github.com/thunderbird/infra-testing.git"
branch_pattern = "THIS_SHOULD_MATCH_NOTHING"
destination_url = "https://hg.mozilla.org/comm-unified/"
destination_branch = "NOT_A_VALID_BRANCH"

[[branch_mappings]]
source_url = "https://github.com/thunderbird/infra-testing.git"
branch_pattern = "main"
destination_url = "ssh://hg.mozilla.org/conduit-testing/comm-infra-testing/"
destination_branch = "default"

[[tag_mappings]]
source_url = "https://github.com/thunderbird/infra-testing.git"

# comm-central:
# tag_pattern = ".+"
# destination_url = "ssh://hg.mozilla.org/comm-central"
# tags_destination_branch = "tags-testing"

# comm-beta:
# tag_pattern = "(^THUNDERBIRD|NIGHTLY|BETA|RELEASE)_.*$"
# destination_url = "ssh://hg.mozilla.org/releases/comm-beta/"
# tags_destination_branch = "tags-unified"

# comm-release:
# tag_pattern = "(^THUNDERBIRD|NIGHTLY|BETA|RELEASE)_.*$"
# destination_url = "ssh://hg.mozilla.org/releases/comm-release/"
# tags_destination_branch = "tags-unified"

# comm-esrXXX
# tag_pattern = "^(THUNDERBIRD)_(\\d+)(_\\d+)+esr_(BUILD\\d+|RELEASE)$"
# destination_url = "ssh://hg.mozilla.org/releases/comm-esr\\2/"
# tags_destination_branch = "tags-unified"
# ...
# tag_pattern = "^ESR_(\\d+)_BASE$"
# destination_url = "ssh://hg.mozilla.org/releases/comm-esr\\1/"
# tags_destination_branch = "tags-unified"

tag_pattern = ".+"
destination_url = "ssh://hg.mozilla.org/conduit-testing/comm-infra-testing/"
tags_destination_branch = "tags-testing"
# Default
#tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"


#####################
# REVIEW (MOZ-PHAB) #
#####################
Expand Down
Loading