Skip to content

feat: bug 2055645: add support for direct git tags in landoscript payloads (BREAKING CHANGE) #238

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

Open
bhearsum wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat: bug 2055645: add support for direct git tags in landoscript payloads (BREAKING CHANGE) #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
11 changes: 6 additions & 5 deletions src/mozilla_taskgraph/worker_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -237,7 +237,8 @@ class L10nBumpInfo(Schema):

class TagConfig(Schema):
types: list[Literal["buildN", "release"]]
hg_repo_url: str
revision: str
hg_repo_url: Optional[str]


class VersionBumpConfig(Schema):
Expand Down Expand Up @@ -379,11 +380,11 @@ def build_lando_payload(config, task, task_def):
tag_names.extend([f"{product}_{version}_RELEASE"])
tag_info = {
"tags": tag_names,
"hg_repo_url": info["hg-repo-url"],
"revision": config.params[
"{}head_rev".format(worker.get("repo-param-prefix", ""))
],
"revision": info["revision"],
}
if repo_url := info.get("hg-repo-url"):
tag_info["hg_repo_url"] = repo_url

task_def["payload"]["tag_info"] = tag_info
actions.append("tag")

Expand Down
49 changes: 40 additions & 9 deletions test/test_worker_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -675,45 +675,72 @@ def test_lando_l10n_bump(build_payload):


@pytest.mark.parametrize(
"types,expected",
"hg_repo_url,revision,types,expected",
(
pytest.param(
"https://hg/repo",
"abcdefghi",
["buildN"],
["PRODUCT_99_0_BUILD1"],
id="buildN",
id="hg_buildN",
),
pytest.param(
"https://hg/repo",
"abcdefghi",
["release"],
["PRODUCT_99_0_RELEASE"],
id="release",
id="hg_release",
),
pytest.param(
"https://hg/repo",
"abcdefghi",
["buildN", "release"],
["PRODUCT_99_0_BUILD1", "PRODUCT_99_0_RELEASE"],
id="buildN_and_release",
id="hg_buildN_and_release",
),
pytest.param(
None,
"abcdefghi",
["buildN"],
["PRODUCT_99_0_BUILD1"],
id="git_buildN",
),
pytest.param(
None,
"abcdefghi",
["release"],
["PRODUCT_99_0_RELEASE"],
id="git_release",
),
pytest.param(
None,
"abcdefghi",
["buildN", "release"],
["PRODUCT_99_0_BUILD1", "PRODUCT_99_0_RELEASE"],
id="git_buildN_and_release",
),
),
)
def test_lando_tag(build_payload, types, expected):
def test_lando_tag(build_payload, hg_repo_url, revision, types, expected):
worker = {
"lando-repo": "testrepo",
"actions": [
{
"tag": {
"types": types,
"hg-repo-url": "https://hg/repo",
"hg-repo-url": hg_repo_url,
"revision": revision,
}
}
],
}
_, task_def = build_payload("scriptworker-lando", worker=worker)
assert task_def == {
expected = {
"payload": {
"actions": ["tag"],
"lando_repo": "testrepo",
"tag_info": {
"hg_repo_url": "https://hg/repo",
"revision": "abcdef",
"revision": revision,
"tags": expected,
},
},
Expand All @@ -723,6 +750,10 @@ def test_lando_tag(build_payload, types, expected):
],
"tags": {"worker-implementation": "scriptworker"},
}
if hg_repo_url:
expected["payload"]["tag_info"]["hg_repo_url"] = hg_repo_url

assert task_def == expected


def test_lando_version_bump(build_payload):
Expand Down