Skip to content

Commit a0bbb12

Browse files
authored
config: sync all tags to all repos (bug 1979342, bug 1962599) (#68)
* config-development: single tag_mapping entry for ff-test-dev * config-production: sync all tags to all repos (bug 1979342, bug 1962599)
1 parent 5a0dc78 commit a0bbb12

File tree

2 files changed

+10
-88
lines changed

2 files changed

+10
-88
lines changed

config-development.toml

Lines changed: 1 addition & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -40,53 +40,12 @@ destination_branch = "\\1"
4040

4141
[[tag_mappings]]
4242
source_url = "https://github.com/mozilla-conduit/ff-test"
43-
tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(BETA|NIGHTLY)_(\\d+)_(BASE|END)$"
43+
tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_.*$"
4444
destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-dev"
4545
tags_destination_branch = "tags-unified-1973880"
4646
# Default
4747
#tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
4848

49-
[[tag_mappings]]
50-
source_url = "https://github.com/mozilla-conduit/ff-test"
51-
tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(\\d+(_\\d+)+)b\\d+_(BUILD\\d+|RELEASE)$"
52-
destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-dev"
53-
tags_destination_branch = "tags-unified-1973880"
54-
# Default
55-
#tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
56-
57-
[[tag_mappings]]
58-
source_url = "https://github.com/mozilla-conduit/ff-test"
59-
tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(\\d+)(_\\d+)+esr_(BUILD\\d+|RELEASE)$"
60-
destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-dev"
61-
tags_destination_branch = "tags-unified-1973880"
62-
# Default
63-
#tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
64-
65-
[[tag_mappings]]
66-
source_url = "https://github.com/mozilla-conduit/ff-test"
67-
tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(\\d+(_\\d+)+)_(BUILD\\d+|RELEASE)$"
68-
destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-dev"
69-
tags_destination_branch = "tags-unified-1973880"
70-
# Default
71-
#tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
72-
73-
[[tag_mappings]]
74-
source_url = "https://github.com/mozilla-conduit/ff-test"
75-
tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(\\d+(_\\d+)+)b\\d+_(BUILD\\d+|RELEASE)$"
76-
destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-dev"
77-
tags_destination_branch = "tags-unified-1973880"
78-
# Default
79-
#tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
80-
81-
[[tag_mappings]]
82-
source_url = "https://github.com/mozilla-conduit/ff-test"
83-
tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_RELEASE_(\\d+)+_(BASE|END)$"
84-
destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-dev"
85-
tags_destination_branch = "tags-unified-1973880"
86-
# Default
87-
#tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
88-
89-
9049
[[tracked_repositories]]
9150
name = "test-repo-github"
9251
url = "https://github.com/mozilla-conduit/test-repo"

config-production.toml

Lines changed: 9 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@ branch_pattern = "THIS_SHOULD_MATCH_NOTHING"
3838
destination_url = "https://hg.mozilla.org/mozilla-unified/"
3939
destination_branch = "NOT_A_VALID_BRANCH"
4040

41-
4241
#
4342
# AUTOLAND
4443
#
@@ -60,26 +59,7 @@ destination_branch = "default"
6059

6160
[[tag_mappings]]
6261
source_url = "https://github.com/mozilla-firefox/firefox.git"
63-
# <M>_<m>(_<p>...)b<n> BUILD and RELEASE tags to mozilla-beta
64-
tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(\\d+(_\\d+)+)b\\d+_(BUILD\\d+|RELEASE)$"
65-
destination_url = "ssh://hg.mozilla.org/releases/mozilla-beta/"
66-
tags_destination_branch = "tags-unified"
67-
# Default
68-
#tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
69-
70-
[[tag_mappings]]
71-
source_url = "https://github.com/mozilla-firefox/firefox.git"
72-
# BETA_<M> BASE and END tags to mozilla-beta
73-
tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_BETA_(\\d+)+_(BASE|END)$"
74-
destination_url = "ssh://hg.mozilla.org/releases/mozilla-beta/"
75-
tags_destination_branch = "tags-unified"
76-
# Default
77-
#tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
78-
79-
[[tag_mappings]]
80-
source_url = "https://github.com/mozilla-firefox/firefox.git"
81-
# RELEASE_<M> BASE tags to mozilla-beta
82-
tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_RELEASE_(\\d+)+_BASE$"
62+
tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_.*$"
8363
destination_url = "ssh://hg.mozilla.org/releases/mozilla-beta/"
8464
tags_destination_branch = "tags-unified"
8565
# Default
@@ -96,6 +76,9 @@ branch_pattern = "^(esr\\d+)$"
9676
destination_url = "ssh://hg.mozilla.org/releases/mozilla-\\1/"
9777
destination_branch = "default"
9878

79+
# We can only sync the tags branch to ESR when an ESR-specific tag is added.
80+
# When such a sync happens, all non-ESR tags currently present on that branch
81+
# will also be pushed to the target ESR repo.
9982
[[tag_mappings]]
10083
source_url = "https://github.com/mozilla-firefox/firefox.git"
10184
# <M>_<m>(_<p>...)esr BUILD and RELEASE tags to mozilla-esr<M>
@@ -106,11 +89,11 @@ tags_destination_branch = "tags-unified"
10689
#tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
10790

10891
#
109-
# relbranches
92+
# ESR relbranches
11093
#
11194
[[branch_mappings]]
11295
source_url = "https://github.com/mozilla-firefox/firefox.git"
113-
# <M>_<m>_X RELBRANCH to mozilla-release matching branch
96+
# ESR_<M>_<m>_X RELBRANCH to mozilla-esr<M> matching branch
11497
branch_pattern = "^((FIREFOX|DEVEDITION|FIREFOX-ANDROID)_ESR_(\\d+)(_\\d+_X)_RELBRANCH)$"
11598
destination_url = "ssh://hg.mozilla.org/releases/mozilla-esr\\3/"
11699
destination_branch = "\\1"
@@ -127,22 +110,12 @@ destination_branch = "default"
127110

128111
[[tag_mappings]]
129112
source_url = "https://github.com/mozilla-firefox/firefox.git"
130-
# NIGHTLY_<M> tags to m-c
131-
tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_NIGHTLY_(\\d+)_(BASE|END)$"
113+
tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_.*$"
132114
destination_url = "ssh://hg.mozilla.org/mozilla-central/"
133115
tags_destination_branch = "tags-unified"
134116
# Default
135117
# tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
136118

137-
[[tag_mappings]]
138-
source_url = "https://github.com/mozilla-firefox/firefox.git"
139-
# BETA_<M>_BASE tags to m-c (in the past, we didn't sync BETA_END, only _BASE)
140-
tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_BETA_(\\d+)_BASE$"
141-
destination_url = "ssh://hg.mozilla.org/mozilla-central/"
142-
tags_destination_branch = "tags-unified"
143-
# Default
144-
#tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
145-
146119

147120
#
148121
# RELEASE
@@ -155,24 +128,14 @@ destination_branch = "default"
155128

156129
[[tag_mappings]]
157130
source_url = "https://github.com/mozilla-firefox/firefox.git"
158-
# <M>_<m>(_<p>...) BUILD and RELEASE tags to mozilla-release
159-
tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_(\\d+(_\\d+)+)_(BUILD\\d+|RELEASE)$"
131+
tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_.*$"
160132
destination_url = "ssh://hg.mozilla.org/releases/mozilla-release/"
161133
tags_destination_branch = "tags-unified"
162134
# # Default
163135
# #tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
164-
#
165-
[[tag_mappings]]
166-
source_url = "https://github.com/mozilla-firefox/firefox.git"
167-
# RELEASE_<M> BASE and END tags to mozilla-release
168-
tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_RELEASE_(\\d+)+_(BASE|END)$"
169-
destination_url = "ssh://hg.mozilla.org/releases/mozilla-release/"
170-
tags_destination_branch = "tags-unified"
171-
# Default
172-
#tag_message_suffix = "a=tagging CLOSED TREE DONTBUILD"
173136

174137
#
175-
# relbranches
138+
# RELEASE relbranches
176139
#
177140
[[branch_mappings]]
178141
source_url = "https://github.com/mozilla-firefox/firefox.git"

0 commit comments

Comments
 (0)