Remove warning about dist-git config loading change (#2341)

Remove warning about dist-git config loading change The warning was up for ~ month, I think we could merge this right away or wait a few weeks, but I am opening it mostly to not forget :D RELEASE NOTES BEGIN N/A RELEASE NOTES END Reviewed-by: Nikola Forró Reviewed-by: Maja Massarini
packit · Feb 19, 2024 · c749765 · c749765
2 parents c1ab816 + 78a6f62
commit c749765
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 32 deletions.
diff --git a/packit_service/constants.py b/packit_service/constants.py
@@ -280,16 +280,6 @@ def from_number(number: int):
     )
 }
 
-CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE = (
-    ":warning: **Changed behaviour of loading the Packit configuration for koji_build "
-    "and bodhi_update jobs**\n\nWe would like to bring to your attention a recent update "
-    "regarding the loading of Packit configuration for `koji_build` and `bodhi_update` jobs. "
-    "Going forward, the configuration for these jobs will be loaded from the default repository"
-    " branch (`rawhide`) instead of the respective branches. This aligns with the behavior "
-    "of the `pull_from_upstream` job. We believe this adjustment will simplify the onboarding "
-    "process and enhance the overall user experience. "
-)
-
 
 class KojiAllowedAccountsAlias(Enum):
     all_admins = "all_admins"

diff --git a/packit_service/worker/handlers/bodhi.py b/packit_service/worker/handlers/bodhi.py
@@ -19,7 +19,6 @@
     MSG_RETRIGGER,
     MSG_GET_IN_TOUCH,
     MSG_DOWNSTREAM_JOB_ERROR_HEADER,
-    CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
     DEFAULT_RETRY_BACKOFF,
 )
 from packit_service.models import (
@@ -199,7 +198,6 @@ def get_handler_specific_task_accepted_message(
             f"in [Packit dashboard]({service_config.dashboard_url}/jobs/bodhi-updates). "
             f"You can also check the recent Bodhi update activity of `{user}` in "
             f"[the Bodhi interface](https://bodhi.fedoraproject.org/users/{user})."
-            f"\n\n---\n\n{CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE}"
         )
 
     def report_in_issue_repository(self, errors: dict[str, str]) -> None:

diff --git a/packit_service/worker/handlers/distgit.py b/packit_service/worker/handlers/distgit.py
@@ -30,7 +30,6 @@
     MSG_GET_IN_TOUCH,
     MSG_DOWNSTREAM_JOB_ERROR_HEADER,
     DEFAULT_RETRY_BACKOFF,
-    CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
     RETRY_LIMIT_RELEASE_ARCHIVE_DOWNLOAD_ERROR,
 )
 from packit_service.models import (
@@ -250,7 +249,6 @@ def sync_branch(
                 release_monitoring_project_id=self.data.event_dict.get(
                     "release_monitoring_project_id"
                 ),
-                pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
                 sync_acls=True,
             )
         except PackitDownloadFailedException as ex:
@@ -601,7 +599,6 @@ def get_handler_specific_task_accepted_message(
         return (
             "You can check the recent runs of pull from upstream jobs "
             f"in [Packit dashboard]({dashboard_url}/jobs/pull-from-upstreams)"
-            f"\n\n---\n\n{CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE}"
         )
 
     def get_resolved_bugs(self) -> List[str]:
@@ -884,7 +881,6 @@ def get_handler_specific_task_accepted_message(
             f"in [Packit dashboard]({dashboard_url}/jobs/downstream-koji-builds). "
             f"You can also check the recent Koji build activity of `{user}` in [the Koji interface]"
             f"(https://koji.fedoraproject.org/koji/userinfo?userID={user_id})."
-            f"\n\n---\n\n{CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE}"
         )
 
 

diff --git a/tests/integration/test_new_hotness_update.py b/tests/integration/test_new_hotness_update.py
@@ -13,7 +13,6 @@
 from packit.distgit import DistGit
 from packit.local_project import LocalProject
 from packit_service.config import ServiceConfig
-from packit_service.constants import CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE
 from packit_service.models import (
     ProjectEventModelType,
     ProjectEventModel,
@@ -170,7 +169,6 @@ def test_new_hotness_update(new_hotness_update, sync_release_model):
         add_pr_instructions=True,
         resolved_bugs=["rhbz#2106196"],
         release_monitoring_project_id=4181,
-        pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
         sync_acls=True,
     ).and_return(pr).once()
     flexmock(PackitAPI).should_receive("clean")

diff --git a/tests/integration/test_pr_comment.py b/tests/integration/test_pr_comment.py
@@ -34,7 +34,6 @@
     DOCS_HOW_TO_CONFIGURE_URL,
     TASK_ACCEPTED,
     DEFAULT_RETRY_LIMIT,
-    CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
     DOCS_VALIDATE_HOOKS,
     DOCS_VALIDATE_CONFIG,
 )
@@ -2429,7 +2428,6 @@ def test_koji_build_retrigger_via_dist_git_pr_comment(pagure_pr_comment_added):
             "You can also check the recent Koji build activity of "
             "`packit` in [the Koji interface]"
             "(https://koji.fedoraproject.org/koji/userinfo?userID=4641)."
-            f"\n\n---\n\n{CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE}"
         )
         .mock()
     )
@@ -2544,7 +2542,6 @@ def test_bodhi_update_retrigger_via_dist_git_pr_comment(pagure_pr_comment_added)
             "in [Packit dashboard](/jobs/bodhi-updates). "
             "You can also check the recent Bodhi update activity of `packit` in "
             "[the Bodhi interface](https://bodhi.fedoraproject.org/users/packit)."
-            f"\n\n---\n\n{CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE}"
         )
         .mock()
     )
@@ -2625,7 +2622,6 @@ def test_pull_from_upstream_retrigger_via_dist_git_pr_comment(pagure_pr_comment_
         .with_args(
             "The task was accepted. You can check the recent runs of pull from upstream jobs in "
             "[Packit dashboard](/jobs/pull-from-upstreams)"
-            f"\n\n---\n\n{CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE}"
         )
         .mock()
     )
@@ -2705,7 +2701,6 @@ def _get_project(url, *_, **__):
         add_pr_instructions=True,
         resolved_bugs=["rhbz#123", "rhbz#124"],
         release_monitoring_project_id=None,
-        pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
         sync_acls=True,
     ).and_return(pr).once()
     flexmock(PackitAPI).should_receive("clean")

diff --git a/tests/integration/test_release_event.py b/tests/integration/test_release_event.py
@@ -20,7 +20,6 @@
 from packit_service.config import ServiceConfig
 from packit_service.constants import (
     TASK_ACCEPTED,
-    CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
 )
 from packit_service.models import (
     ProjectEventModelType,
@@ -209,7 +208,6 @@ def test_dist_git_push_release_handle(github_release_webhook, propose_downstream
         add_pr_instructions=True,
         resolved_bugs=[],
         release_monitoring_project_id=None,
-        pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
         sync_acls=True,
     ).and_return(pr).once()
     flexmock(PackitAPI).should_receive("clean")
@@ -348,7 +346,6 @@ def test_dist_git_push_release_handle_multiple_branches(
             add_pr_instructions=True,
             resolved_bugs=[],
             release_monitoring_project_id=None,
-            pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
             sync_acls=True,
         ).and_return(pr).once()
 
@@ -494,7 +491,6 @@ def test_dist_git_push_release_handle_one_failed(
                 add_pr_instructions=True,
                 resolved_bugs=[],
                 release_monitoring_project_id=None,
-                pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
                 sync_acls=True,
             ).and_return(pr).once()
             flexmock(ProposeDownstreamJobHelper).should_receive(
@@ -516,7 +512,6 @@ def test_dist_git_push_release_handle_one_failed(
                 add_pr_instructions=True,
                 resolved_bugs=[],
                 release_monitoring_project_id=None,
-                pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
                 sync_acls=True,
             ).and_raise(Exception, f"Failed {model.branch}").once()
             flexmock(ProposeDownstreamJobHelper).should_receive(
@@ -757,7 +752,6 @@ def test_retry_propose_downstream_task(
         add_pr_instructions=True,
         resolved_bugs=[],
         release_monitoring_project_id=None,
-        pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
         sync_acls=True,
     ).and_raise(
         PackitDownloadFailedException, "Failed to download source from example.com"
@@ -868,7 +862,6 @@ def test_dont_retry_propose_downstream_task(
         add_pr_instructions=True,
         resolved_bugs=[],
         release_monitoring_project_id=None,
-        pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
         sync_acls=True,
     ).and_raise(
         PackitDownloadFailedException, "Failed to download source from example.com"

diff --git a/tests/unit/test_steve.py b/tests/unit/test_steve.py
@@ -22,7 +22,6 @@
 from packit_service.config import ServiceConfig
 from packit_service.constants import (
     TASK_ACCEPTED,
-    CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
 )
 from packit_service.models import (
     ProjectEventModelType,
@@ -187,7 +186,6 @@ def test_process_message(event, private, enabled_private_namespaces, success):
         add_pr_instructions=True,
         resolved_bugs=[],
         release_monitoring_project_id=None,
-        pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
         sync_acls=True,
     ).and_return(pr).times(1 if success else 0)
     flexmock(shutil).should_receive("rmtree").with_args("")