From 6922fcd348e1b7af5f464b86cec4d53ddf24c491 Mon Sep 17 00:00:00 2001 From: FrantiĊĦek Zatloukal Date: Feb 03 2021 08:44:37 +0000 Subject: Support main and rawhide branches for Fedora Rawhide PRs --- diff --git a/oraculum/utils/dashboard_helpers.py b/oraculum/utils/dashboard_helpers.py index c474623..83e84fe 100644 --- a/oraculum/utils/dashboard_helpers.py +++ b/oraculum/utils/dashboard_helpers.py @@ -91,7 +91,7 @@ def branched_frozen(): """ Returns true if current branched is frozen """ - result = get_yaml("https://pagure.io/fedora-infra/ansible/raw/master/f/vars/all/Frozen.yaml") + result = get_yaml("https://pagure.io/fedora-infra/ansible/raw/main/f/vars/all/Frozen.yaml") try: return result["Frozen"] except (KeyError, AttributeError): diff --git a/oraculum/utils/pagure.py b/oraculum/utils/pagure.py index 6624c07..5403c4a 100644 --- a/oraculum/utils/pagure.py +++ b/oraculum/utils/pagure.py @@ -54,6 +54,10 @@ def get_package_prs(package): Returns all open Pull Requests for a single package """ data = [] + # dist-git migrated its master branch to rawhide and new prs might be against that or main for rawhide + # https://fedoraproject.org/wiki/Changes/GitRepos-master-to-main + rawhide_branches = set(["master", "main", "rawhide"]) + resp_package_prs = get_json("https://src.fedoraproject.org/api/0/rpms/%s/pull-requests" % package) if not resp_package_prs: return None @@ -72,7 +76,7 @@ def get_package_prs(package): "date_created": str(datetime.datetime.fromtimestamp(int(request["date_created"]))), "last_updated": str(datetime.datetime.fromtimestamp(int(request["last_updated"]))), "ci_status": get_pr_ci_result(package, request["id"]), - "release": "Fedora Rawhide" if request["branch"] == "master" else release_from_dist(request["branch"]), + "release": "Fedora Rawhide" if request["branch"] in rawhide_branches else release_from_dist(request["branch"]), "url": "https://src.fedoraproject.org/rpms/%s/pull-request/%s" % (package, request["id"]) }) return data diff --git a/tests/test_packager_dashboard_pagure.py b/tests/test_packager_dashboard_pagure.py index b97cca8..69ccbad 100644 --- a/tests/test_packager_dashboard_pagure.py +++ b/tests/test_packager_dashboard_pagure.py @@ -82,7 +82,7 @@ class TestPagure(object): "title": "Open PR Title", "date_created": "1598478958", "last_updated": "1568380289", - "branch": "master", + "branch": "main", "user": { "name": "John Doe" }, @@ -94,7 +94,7 @@ class TestPagure(object): "title": "Open PR Title", "date_created": "1598478958", "last_updated": "1568380289", - "branch": "master", + "branch": "rawhide", "user": { "name": "John Doe" },