From 0b98b43390ab0ed9f85b04bbcef9c7898667f97b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nikola=20Forr=C3=B3?= Date: Mon, 15 Jan 2024 16:43:38 +0100 Subject: [PATCH] Migrate to org.fedoraproject.prod.pagure.git.receive MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Nikola Forró --- packit_service/worker/events/enums.py | 2 +- packit_service/worker/handlers/distgit.py | 4 +- packit_service/worker/parser.py | 14 +++--- tests/data/fedmsg/distgit_commit.json | 47 ++++-------------- tests/data/fedmsg/distgit_push_packit.json | 55 +++------------------- 5 files changed, 25 insertions(+), 97 deletions(-) diff --git a/packit_service/worker/events/enums.py b/packit_service/worker/events/enums.py index 5d1fd95f5..bcf6d7d7a 100644 --- a/packit_service/worker/events/enums.py +++ b/packit_service/worker/events/enums.py @@ -28,6 +28,6 @@ class IssueCommentAction(Enum): class FedmsgTopic(Enum): - dist_git_push = "org.fedoraproject.prod.git.receive" + dist_git_push = "org.fedoraproject.prod.pagure.git.receive" copr_build_finished = "org.fedoraproject.prod.copr.build.end" copr_build_started = "org.fedoraproject.prod.copr.build.start" diff --git a/packit_service/worker/handlers/distgit.py b/packit_service/worker/handlers/distgit.py index ce4f710f9..290a9eedf 100644 --- a/packit_service/worker/handlers/distgit.py +++ b/packit_service/worker/handlers/distgit.py @@ -486,7 +486,7 @@ class AbortSyncRelease(Exception): @reacts_to(event=AbstractIssueCommentEvent) @reacts_to(event=CheckRerunReleaseEvent) class ProposeDownstreamHandler(AbstractSyncReleaseHandler): - topic = "org.fedoraproject.prod.git.receive" + topic = "org.fedoraproject.prod.pagure.git.receive" task_name = TaskName.propose_downstream helper_kls = ProposeDownstreamJobHelper sync_release_job_type = SyncReleaseJobType.propose_downstream @@ -646,7 +646,7 @@ class AbstractDownstreamKojiBuildHandler( This handler can submit a build in Koji from a dist-git. """ - topic = "org.fedoraproject.prod.git.receive" + topic = "org.fedoraproject.prod.pagure.git.receive" task_name = TaskName.downstream_koji_build def __init__( diff --git a/packit_service/worker/parser.py b/packit_service/worker/parser.py index 5276cd9b8..3c3efbeb6 100644 --- a/packit_service/worker/parser.py +++ b/packit_service/worker/parser.py @@ -1078,25 +1078,25 @@ def parse_release_event(event) -> Optional[ReleaseEvent]: def parse_pagure_push_event(event) -> Optional[PushPagureEvent]: """this corresponds to dist-git event when someone pushes new commits""" topic = event.get("topic") - if topic != "org.fedoraproject.prod.git.receive": + if topic != "org.fedoraproject.prod.pagure.git.receive": return None logger.info(f"Dist-git commit event, topic: {topic}") - dg_repo_namespace = nested_get(event, "commit", "namespace") - dg_repo_name = nested_get(event, "commit", "repo") + dg_repo_namespace = nested_get(event, "repo", "namespace") + dg_repo_name = nested_get(event, "repo", "name") if not (dg_repo_namespace and dg_repo_name): logger.warning("No full name of the repository.") return None - dg_branch = nested_get(event, "commit", "branch") - dg_commit = nested_get(event, "commit", "rev") + dg_branch = nested_get(event, "branch") + dg_commit = nested_get(event, "end_commit") if not (dg_branch and dg_commit): logger.warning("Target branch/rev for the new commits is not set.") return None - username = nested_get(event, "commit", "username") + username = nested_get(event, "agent") logger.info( f"New commits added to dist-git repo {dg_repo_namespace}/{dg_repo_name}," @@ -1591,7 +1591,7 @@ def parse_new_hotness_update_event(event) -> Optional[NewHotnessUpdateEvent]: "pagure.pull-request.flag.added": parse_pagure_pr_flag_event.__func__, # type: ignore "pagure.pull-request.flag.updated": parse_pagure_pr_flag_event.__func__, # type: ignore "pagure.pull-request.comment.added": parse_pagure_pull_request_comment_event.__func__, # type: ignore # noqa: E501 - "git.receive": parse_pagure_push_event.__func__, # type: ignore + "pagure.git.receive": parse_pagure_push_event.__func__, # type: ignore "copr.build.start": parse_copr_event.__func__, # type: ignore "copr.build.end": parse_copr_event.__func__, # type: ignore "buildsys.task.state.change": parse_koji_task_event.__func__, # type: ignore diff --git a/tests/data/fedmsg/distgit_commit.json b/tests/data/fedmsg/distgit_commit.json index ef2468aa6..82308eaeb 100644 --- a/tests/data/fedmsg/distgit_commit.json +++ b/tests/data/fedmsg/distgit_commit.json @@ -1,42 +1,11 @@ { - "topic": "org.fedoraproject.prod.git.receive", - "commit": { - "agent": "rhcontainerbot", - "branch": "main", - "email": "hello@packit.dev", - "message": "buildah-1.12.0-0.73.dev.git1e6a70c\n\n- autobuilt 1e6a70c\n\nSigned-off-by: RH Container Bot \n", - "name": "Packit", + "agent": "rhcontainerbot", + "branch": "main", + "end_commit": "abcd", + "total_commits": 1, + "repo": { "namespace": "rpms", - "path": "/srv/git/repositories/rpms/buildah.git", - "repo": "buildah", - "rev": "abcd", - "seen": false, - "stats": { - "files": { - ".gitignore": { - "additions": 1, - "deletions": 0, - "lines": 1 - }, - "buildah.spec": { - "additions": 5, - "deletions": 2, - "lines": 7 - }, - "sources": { - "additions": 1, - "deletions": 1, - "lines": 2 - } - }, - "total": { - "additions": 7, - "deletions": 3, - "files": 3, - "lines": 10 - } - }, - "summary": "buildah-1.12.0-0.73.dev.git1e6a70c", - "username": "rhcontainerbot" - } + "name": "buildah" + }, + "topic": "org.fedoraproject.prod.pagure.git.receive" } diff --git a/tests/data/fedmsg/distgit_push_packit.json b/tests/data/fedmsg/distgit_push_packit.json index c5a748f59..2b17f8b7d 100644 --- a/tests/data/fedmsg/distgit_push_packit.json +++ b/tests/data/fedmsg/distgit_push_packit.json @@ -1,52 +1,11 @@ { - "commit": { - "agent": "pagure", - "branch": "f36", - "email": "hello@packit.dev", - "message": "[packit] 0.50.0 upstream release\n\nUpstream tag: 0.50.0\nUpstream commit: c3667a91\n\nSigned-off-by: Packit \n", - "name": "Packit", + "agent": "pagure", + "branch": "f36", + "end_commit": "ad0c308af91da45cf40b253cd82f07f63ea9cbbf", + "total_commits": 1, + "repo": { "namespace": "rpms", - "path": "/srv/git/repositories/rpms/packit.git", - "repo": "packit", - "rev": "ad0c308af91da45cf40b253cd82f07f63ea9cbbf", - "seen": false, - "stats": { - "files": { - ".gitignore": { - "additions": 1, - "deletions": 0, - "lines": 1 - }, - "README.packit": { - "additions": 1, - "deletions": 1, - "lines": 2 - }, - "packit.spec": { - "additions": 9, - "deletions": 1, - "lines": 10 - }, - "plans/main.fmf": { - "additions": 1, - "deletions": 1, - "lines": 2 - }, - "sources": { - "additions": 1, - "deletions": 1, - "lines": 2 - } - }, - "total": { - "additions": 13, - "deletions": 4, - "files": 5, - "lines": 17 - } - }, - "summary": "[packit] 0.50.0 upstream release", - "username": "pagure" + "name": "packit" }, - "topic": "org.fedoraproject.prod.git.receive" + "topic": "org.fedoraproject.prod.pagure.git.receive" }