Skip to content

Commit c749765

Browse files
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
2 parents c1ab816 + 78a6f62 commit c749765

File tree

7 files changed

+0
-32
lines changed

7 files changed

+0
-32
lines changed

packit_service/constants.py

-10
Original file line numberDiff line numberDiff line change
@@ -280,16 +280,6 @@ def from_number(number: int):
280280
)
281281
}
282282

283-
CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE = (
284-
":warning: **Changed behaviour of loading the Packit configuration for koji_build "
285-
"and bodhi_update jobs**\n\nWe would like to bring to your attention a recent update "
286-
"regarding the loading of Packit configuration for `koji_build` and `bodhi_update` jobs. "
287-
"Going forward, the configuration for these jobs will be loaded from the default repository"
288-
" branch (`rawhide`) instead of the respective branches. This aligns with the behavior "
289-
"of the `pull_from_upstream` job. We believe this adjustment will simplify the onboarding "
290-
"process and enhance the overall user experience. "
291-
)
292-
293283

294284
class KojiAllowedAccountsAlias(Enum):
295285
all_admins = "all_admins"

packit_service/worker/handlers/bodhi.py

-2
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
MSG_RETRIGGER,
2020
MSG_GET_IN_TOUCH,
2121
MSG_DOWNSTREAM_JOB_ERROR_HEADER,
22-
CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
2322
DEFAULT_RETRY_BACKOFF,
2423
)
2524
from packit_service.models import (
@@ -199,7 +198,6 @@ def get_handler_specific_task_accepted_message(
199198
f"in [Packit dashboard]({service_config.dashboard_url}/jobs/bodhi-updates). "
200199
f"You can also check the recent Bodhi update activity of `{user}` in "
201200
f"[the Bodhi interface](https://bodhi.fedoraproject.org/users/{user})."
202-
f"\n\n---\n\n{CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE}"
203201
)
204202

205203
def report_in_issue_repository(self, errors: dict[str, str]) -> None:

packit_service/worker/handlers/distgit.py

-4
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
MSG_GET_IN_TOUCH,
3131
MSG_DOWNSTREAM_JOB_ERROR_HEADER,
3232
DEFAULT_RETRY_BACKOFF,
33-
CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
3433
RETRY_LIMIT_RELEASE_ARCHIVE_DOWNLOAD_ERROR,
3534
)
3635
from packit_service.models import (
@@ -250,7 +249,6 @@ def sync_branch(
250249
release_monitoring_project_id=self.data.event_dict.get(
251250
"release_monitoring_project_id"
252251
),
253-
pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
254252
sync_acls=True,
255253
)
256254
except PackitDownloadFailedException as ex:
@@ -601,7 +599,6 @@ def get_handler_specific_task_accepted_message(
601599
return (
602600
"You can check the recent runs of pull from upstream jobs "
603601
f"in [Packit dashboard]({dashboard_url}/jobs/pull-from-upstreams)"
604-
f"\n\n---\n\n{CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE}"
605602
)
606603

607604
def get_resolved_bugs(self) -> List[str]:
@@ -884,7 +881,6 @@ def get_handler_specific_task_accepted_message(
884881
f"in [Packit dashboard]({dashboard_url}/jobs/downstream-koji-builds). "
885882
f"You can also check the recent Koji build activity of `{user}` in [the Koji interface]"
886883
f"(https://koji.fedoraproject.org/koji/userinfo?userID={user_id})."
887-
f"\n\n---\n\n{CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE}"
888884
)
889885

890886

tests/integration/test_new_hotness_update.py

-2
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
from packit.distgit import DistGit
1414
from packit.local_project import LocalProject
1515
from packit_service.config import ServiceConfig
16-
from packit_service.constants import CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE
1716
from packit_service.models import (
1817
ProjectEventModelType,
1918
ProjectEventModel,
@@ -170,7 +169,6 @@ def test_new_hotness_update(new_hotness_update, sync_release_model):
170169
add_pr_instructions=True,
171170
resolved_bugs=["rhbz#2106196"],
172171
release_monitoring_project_id=4181,
173-
pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
174172
sync_acls=True,
175173
).and_return(pr).once()
176174
flexmock(PackitAPI).should_receive("clean")

tests/integration/test_pr_comment.py

-5
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
DOCS_HOW_TO_CONFIGURE_URL,
3535
TASK_ACCEPTED,
3636
DEFAULT_RETRY_LIMIT,
37-
CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
3837
DOCS_VALIDATE_HOOKS,
3938
DOCS_VALIDATE_CONFIG,
4039
)
@@ -2429,7 +2428,6 @@ def test_koji_build_retrigger_via_dist_git_pr_comment(pagure_pr_comment_added):
24292428
"You can also check the recent Koji build activity of "
24302429
"`packit` in [the Koji interface]"
24312430
"(https://koji.fedoraproject.org/koji/userinfo?userID=4641)."
2432-
f"\n\n---\n\n{CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE}"
24332431
)
24342432
.mock()
24352433
)
@@ -2544,7 +2542,6 @@ def test_bodhi_update_retrigger_via_dist_git_pr_comment(pagure_pr_comment_added)
25442542
"in [Packit dashboard](/jobs/bodhi-updates). "
25452543
"You can also check the recent Bodhi update activity of `packit` in "
25462544
"[the Bodhi interface](https://bodhi.fedoraproject.org/users/packit)."
2547-
f"\n\n---\n\n{CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE}"
25482545
)
25492546
.mock()
25502547
)
@@ -2625,7 +2622,6 @@ def test_pull_from_upstream_retrigger_via_dist_git_pr_comment(pagure_pr_comment_
26252622
.with_args(
26262623
"The task was accepted. You can check the recent runs of pull from upstream jobs in "
26272624
"[Packit dashboard](/jobs/pull-from-upstreams)"
2628-
f"\n\n---\n\n{CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE}"
26292625
)
26302626
.mock()
26312627
)
@@ -2705,7 +2701,6 @@ def _get_project(url, *_, **__):
27052701
add_pr_instructions=True,
27062702
resolved_bugs=["rhbz#123", "rhbz#124"],
27072703
release_monitoring_project_id=None,
2708-
pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
27092704
sync_acls=True,
27102705
).and_return(pr).once()
27112706
flexmock(PackitAPI).should_receive("clean")

tests/integration/test_release_event.py

-7
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from packit_service.config import ServiceConfig
2121
from packit_service.constants import (
2222
TASK_ACCEPTED,
23-
CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
2423
)
2524
from packit_service.models import (
2625
ProjectEventModelType,
@@ -209,7 +208,6 @@ def test_dist_git_push_release_handle(github_release_webhook, propose_downstream
209208
add_pr_instructions=True,
210209
resolved_bugs=[],
211210
release_monitoring_project_id=None,
212-
pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
213211
sync_acls=True,
214212
).and_return(pr).once()
215213
flexmock(PackitAPI).should_receive("clean")
@@ -348,7 +346,6 @@ def test_dist_git_push_release_handle_multiple_branches(
348346
add_pr_instructions=True,
349347
resolved_bugs=[],
350348
release_monitoring_project_id=None,
351-
pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
352349
sync_acls=True,
353350
).and_return(pr).once()
354351

@@ -494,7 +491,6 @@ def test_dist_git_push_release_handle_one_failed(
494491
add_pr_instructions=True,
495492
resolved_bugs=[],
496493
release_monitoring_project_id=None,
497-
pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
498494
sync_acls=True,
499495
).and_return(pr).once()
500496
flexmock(ProposeDownstreamJobHelper).should_receive(
@@ -516,7 +512,6 @@ def test_dist_git_push_release_handle_one_failed(
516512
add_pr_instructions=True,
517513
resolved_bugs=[],
518514
release_monitoring_project_id=None,
519-
pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
520515
sync_acls=True,
521516
).and_raise(Exception, f"Failed {model.branch}").once()
522517
flexmock(ProposeDownstreamJobHelper).should_receive(
@@ -757,7 +752,6 @@ def test_retry_propose_downstream_task(
757752
add_pr_instructions=True,
758753
resolved_bugs=[],
759754
release_monitoring_project_id=None,
760-
pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
761755
sync_acls=True,
762756
).and_raise(
763757
PackitDownloadFailedException, "Failed to download source from example.com"
@@ -868,7 +862,6 @@ def test_dont_retry_propose_downstream_task(
868862
add_pr_instructions=True,
869863
resolved_bugs=[],
870864
release_monitoring_project_id=None,
871-
pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
872865
sync_acls=True,
873866
).and_raise(
874867
PackitDownloadFailedException, "Failed to download source from example.com"

tests/unit/test_steve.py

-2
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
from packit_service.config import ServiceConfig
2323
from packit_service.constants import (
2424
TASK_ACCEPTED,
25-
CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
2625
)
2726
from packit_service.models import (
2827
ProjectEventModelType,
@@ -187,7 +186,6 @@ def test_process_message(event, private, enabled_private_namespaces, success):
187186
add_pr_instructions=True,
188187
resolved_bugs=[],
189188
release_monitoring_project_id=None,
190-
pr_description_footer=CHANGED_LOADING_BEHAVIOUR_IN_DISTGIT_MESSAGE,
191189
sync_acls=True,
192190
).and_return(pr).times(1 if success else 0)
193191
flexmock(shutil).should_receive("rmtree").with_args("")

0 commit comments

Comments
 (0)