Skip to content

config: add .git to URLs for dev and stage, and test fixes (bug 1987822) #74

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
Sep 10, 2025
Merged

config: add .git to URLs for dev and stage, and test fixes (bug 1987822) #74

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
2802579
config: add .git to URLs for dev and stage
shtrom Sep 9, 2025
4397ff8
test_repo_synchronizer: fix test_sync_process (bug 1987822)
shtrom Sep 10, 2025
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
14 changes: 7 additions & 7 deletions config-development.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,10 +21,10 @@ directory = "/clones"

[[tracked_repositories]]
name = "ff-test"
url = "https://github.com/mozilla-conduit/ff-test"
url = "https://github.com/mozilla-conduit/ff-test.git"

[[branch_mappings]]
source_url = "https://github.com/mozilla-conduit/ff-test"
source_url = "https://github.com/mozilla-conduit/ff-test.git"
branch_pattern = "dev"
destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-dev"
destination_branch = "default"
Expand All @@ -33,14 +33,14 @@ destination_branch = "default"
# relbranches
#
[[branch_mappings]]
source_url = "https://github.com/mozilla-conduit/ff-test"
source_url = "https://github.com/mozilla-conduit/ff-test.git"
# <M>_<m>_X RELBRANCH to mozilla-release matching branch
branch_pattern = "^((FIREFOX|DEVEDITION|FIREFOX-ANDROID)_ESR_(\\d+)(_\\d+_X)_RELBRANCH)$"
destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-dev"
destination_branch = "\\1"

[[tag_mappings]]
source_url = "https://github.com/mozilla-conduit/ff-test"
source_url = "https://github.com/mozilla-conduit/ff-test.git"
tag_pattern = "^(FIREFOX|DEVEDITION|FIREFOX-ANDROID)_.*$"
destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-dev"
tags_destination_branch = "tags-unified-1973880"
Expand All @@ -49,16 +49,16 @@ tags_destination_branch = "tags-unified-1973880"

[[tracked_repositories]]
name = "test-repo-github"
url = "https://github.com/mozilla-conduit/test-repo"
url = "https://github.com/mozilla-conduit/test-repo.git"

[[branch_mappings]]
source_url = "https://github.com/mozilla-conduit/test-repo"
source_url = "https://github.com/mozilla-conduit/test-repo.git"
branch_pattern = "dev"
destination_url = "ssh://hg.mozilla.org/conduit-testing/test-repo-github-dev"
destination_branch = "default"

[[tag_mappings]]
source_url = "https://github.com/mozilla-conduit/test-repo"
source_url = "https://github.com/mozilla-conduit/test-repo.git"
tag_pattern = "^(DEV)_(BETA|NIGHTLY)_(\\d+)_(BASE|END)$"
destination_url = "ssh://hg.mozilla.org/conduit-testing/test-repo-github-dev"
tags_destination_branch = "tags-unified-1973880"
Expand Down
12 changes: 6 additions & 6 deletions config-staging.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,16 +21,16 @@ directory = "/clones"

[[tracked_repositories]]
name = "ff-test"
url = "https://github.com/mozilla-conduit/ff-test"
url = "https://github.com/mozilla-conduit/ff-test.git"

[[branch_mappings]]
source_url = "https://github.com/mozilla-conduit/ff-test"
source_url = "https://github.com/mozilla-conduit/ff-test.git"
branch_pattern = "stage"
destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-stage"
destination_branch = "default"

[[tag_mappings]]
source_url = "https://github.com/mozilla-conduit/ff-test"
source_url = "https://github.com/mozilla-conduit/ff-test.git"
tag_pattern = "^(STAGE)_(BETA|NIGHTLY)_(\\d+)_(BASE|END)$"
destination_url = "ssh://hg.mozilla.org/conduit-testing/ff-test-stage"
tags_destination_branch = "stage-tags"
Expand All @@ -40,16 +40,16 @@ tags_destination_branch = "stage-tags"

[[tracked_repositories]]
name = "test-repo-github"
url = "https://github.com/mozilla-conduit/test-repo"
url = "https://github.com/mozilla-conduit/test-repo.git"

[[branch_mappings]]
source_url = "https://github.com/mozilla-conduit/test-repo"
source_url = "https://github.com/mozilla-conduit/test-repo.git"
branch_pattern = "stage"
destination_url = "ssh://hg.mozilla.org/conduit-testing/test-repo-github-stage"
destination_branch = "default"

[[tag_mappings]]
source_url = "https://github.com/mozilla-conduit/test-repo"
source_url = "https://github.com/mozilla-conduit/test-repo.git"
tag_pattern = "^(STAGE)_(BETA|NIGHTLY)_(\\d+)_(BASE|END)$"
destination_url = "ssh://hg.mozilla.org/conduit-testing/test-repo-github-stage"
tags_destination_branch = "stage-tags"
Expand Down
3 changes: 0 additions & 3 deletions tests/test_repo_synchronizer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -151,9 +151,6 @@ def test_sync_process(
undo_log = undo.read()
assert ".hgtags" in undo_log
assert "bar.txt" not in undo_log
assert len(undo_log.strip().split("\n")) == 3, (
"An unexpected number of files was changed in the last push"
)


def test_sync_process_duplicate_tags(
Expand Down