Remove deprecated code (#2532)

Remove deprecated code

Marge before packit/packit#2412

Reviewed-by: Laura Barcziová
Reviewed-by: Matej Focko

packit_service/worker/handlers/abstract.py

@@ -71,7 +71,6 @@ class ProposeDownstreamHandler(JobHandler):
     E.g. CoprBuildHandler uses both copr_build and build:
     ```
     @configured_as(job_type=JobType.copr_build)
-    @configured_as(job_type=JobType.build)
     class CoprBuildHandler(JobHandler):
     ```
     """
@@ -146,7 +145,6 @@ def run_for_comment(command: str):
     ```
     @configured_as(job_type=JobType.propose_downstream)
     @run_for_comment(command="propose-downstream")
-    @run_for_comment(command="propose-update")
     @reacts_to(event=ReleaseEvent)
     @reacts_to(event=IssueCommentEvent)
     class ProposeDownstreamHandler(JobHandler):
@@ -173,7 +171,6 @@ def run_for_check_rerun(prefix: str):
     Example:
     ```
     @configured_as(job_type=JobType.copr_build)
-    @configured_as(job_type=JobType.build)
     @run_for_check_rerun(prefix="rpm-build")
     @reacts_to(CheckRerunPullRequestEvent)
     @reacts_to(CheckRerunCommitEvent)

packit_service/worker/handlers/copr.py

@@ -80,7 +80,6 @@
 
 
 @configured_as(job_type=JobType.copr_build)
-@configured_as(job_type=JobType.build)
 @run_for_comment(command="build")
 @run_for_comment(command="copr-build")
 @run_for_comment(command="rebuild-failed")
@@ -144,7 +143,6 @@ def get_checkers() -> tuple[type[Checker], ...]:
 
 
 @configured_as(job_type=JobType.copr_build)
-@configured_as(job_type=JobType.build)
 @reacts_to(event=CoprBuildStartEvent)
 class CoprBuildStartHandler(AbstractCoprBuildReportHandler):
     topic = "org.fedoraproject.prod.copr.build.start"
@@ -229,7 +227,6 @@ def run(self):
 
 
 @configured_as(job_type=JobType.copr_build)
-@configured_as(job_type=JobType.build)
 @reacts_to(event=CoprBuildEndEvent)
 class CoprBuildEndHandler(AbstractCoprBuildReportHandler):
     topic = "org.fedoraproject.prod.copr.build.end"

packit_service/worker/handlers/distgit.py

@@ -266,7 +266,6 @@ def sync_branch(
                 "create_pr": True,
                 "local_pr_branch_suffix": branch_suffix,
                 "use_downstream_specfile": is_pull_from_upstream_job,
-                "sync_default_files": not is_pull_from_upstream_job,
                 "add_pr_instructions": True,
                 "resolved_bugs": self.get_resolved_bugs(),
                 "release_monitoring_project_id": self.data.event_dict.get(
@@ -577,7 +576,6 @@ class AbortSyncRelease(Exception):
 
 @configured_as(job_type=JobType.propose_downstream)
 @run_for_comment(command="propose-downstream")
-@run_for_comment(command="propose-update")  # deprecated
 @run_for_check_rerun(prefix="propose-downstream")
 @reacts_to(event=ReleaseEvent)
 @reacts_to(event=ReleaseGitlabEvent)

packit_service/worker/handlers/koji.py

@@ -84,11 +84,8 @@
 logger = logging.getLogger(__name__)
 
 
-@configured_as(job_type=JobType.production_build)
 @configured_as(job_type=JobType.upstream_koji_build)
-@run_for_comment(command="production-build")
 @run_for_comment(command="upstream-koji-build")
-@run_for_check_rerun(prefix="production-build")
 @run_for_check_rerun(prefix="koji-build")
 @reacts_to(ReleaseEvent)
 @reacts_to(ReleaseGitlabEvent)
@@ -264,7 +261,6 @@ def run(self):
         return TaskResults(success=True, details={"msg": msg})
 
 
-@configured_as(job_type=JobType.production_build)
 @configured_as(job_type=JobType.upstream_koji_build)
 @reacts_to(event=KojiTaskEvent)
 class KojiTaskReportHandler(AbstractKojiTaskReportHandler):

packit_service/worker/helpers/build/build_helper.py

@@ -29,7 +29,6 @@
     SRPMBuildModel,
 )
 from packit_service.service.urls import get_srpm_build_info_url
-from packit_service.trigger_mapping import are_job_types_same
 from packit_service.worker.events import EventData
 from packit_service.worker.helpers.job_helper import BaseJobHelper
 from packit_service.worker.monitoring import Pushgateway
@@ -149,10 +148,7 @@ def job_build(self) -> Optional[JobConfig]:
             return None
         if not self._job_build:
             for job in [self.job_config, *self.package_config.jobs]:
-                if are_job_types_same(
-                    job.type,
-                    self.job_type_build,
-                ) and self.is_job_config_trigger_matching(job):
+                if job.type == self.job_type_build and self.is_job_config_trigger_matching(job):
                     self._job_build = job
                     break
         return self._job_build
@@ -174,11 +170,7 @@ def job_tests_all(self) -> list[JobConfig]:
             self._job_tests_all = [
                 job
                 for job in self.package_config.jobs
-                if are_job_types_same(
-                    job.type,
-                    self.job_type_test,
-                )
-                and self.is_job_config_trigger_matching(job)
+                if (job.type == self.job_type_test and self.is_job_config_trigger_matching(job))
             ]
 
         return self._job_tests_all

packit_service/worker/helpers/build/koji_build.py

@@ -33,7 +33,7 @@
 
 
 class KojiBuildJobHelper(BaseBuildJobHelper):
-    job_type_build = JobType.production_build
+    job_type_build = JobType.upstream_koji_build
     job_type_test = None
     status_name_build: str = "koji-build"
     status_name_test: str = None

packit_service/worker/helpers/open_scan_hub.py

@@ -183,7 +183,7 @@ def find_base_build_job(self) -> Optional[JobConfig]:
 
         for job in self.copr_build_helper.package_config.get_job_views():
             if (
-                job.type in (JobType.copr_build, JobType.build)
+                job.type == JobType.copr_build
                 and job.trigger == JobConfigTriggerType.commit
                 and (
                     (

packit_service/worker/helpers/sync_release/sync_release.py

@@ -15,7 +15,6 @@
 
 from packit_service.config import ServiceConfig
 from packit_service.models import ProjectEventModel
-from packit_service.trigger_mapping import are_job_types_same
 from packit_service.worker.events import EventData
 from packit_service.worker.helpers.job_helper import BaseJobHelper
 
@@ -102,7 +101,7 @@ def job(self) -> Optional[JobConfig]:
         """
         if not self._job:
             for job in [self.job_config, *self.package_config.jobs]:
-                if are_job_types_same(job.type, self.job_type) and (
+                if job.type == self.job_type and (
                     self._db_project_object
                     and (
                         self._db_project_object.job_config_trigger_type == job.trigger

packit_service/worker/jobs.py

@@ -14,13 +14,11 @@
 import celery
 from ogr.exceptions import GithubAppNotInstalledError
 from packit.config import JobConfig, JobConfigTriggerType, JobConfigView, JobType
-from packit.config.job_config import DEPRECATED_JOB_TYPES
 from packit.utils import nested_get
 
 from packit_service.config import PackageConfig, PackageConfigGetter, ServiceConfig
 from packit_service.constants import (
     COMMENT_REACTION,
-    DOCS_CONFIGURATION_URL,
     PACKIT_VERIFY_FAS_COMMAND,
     TASK_ACCEPTED,
 )
@@ -640,30 +638,15 @@ def should_task_be_created_for_job_config_and_handler(
             )
             return False
 
-        if not handler_kls.pre_check(
+        return handler_kls.pre_check(
             package_config=(
                 self.event.packages_config.get_package_config_for(job_config)
                 if self.event.packages_config
                 else None
             ),
             job_config=job_config,
             event=self.event.get_dict(),
-        ):
-            return False
-
-        if deprecation_msg := DEPRECATED_JOB_TYPES.get(job_config.type):
-            job_helper = self.initialize_job_helper(handler_kls, job_config)
-            job_helper.status_reporter.report(
-                state=BaseCommitStatus.error,
-                description=f"Job name `{job_config.type.name}` deprecated.",
-                url=f"{DOCS_CONFIGURATION_URL}/#supported-jobs",
-                check_names=f"config-deprecation-{job_config.type.name}",
-                markdown_content=f"{deprecation_msg}\n\n"
-                "The support for the old name will be removed "
-                "by the end of the year.",
-            )
-
-        return True
+        )
 
     def is_project_public_or_enabled_private(self) -> bool:
         """

tests/data/webhooks/github/pr_comment_production_build.json

@@ -79,7 +79,7 @@
     "created_at": "2019-08-08T15:22:24Z",
     "updated_at": "2019-08-08T15:22:24Z",
     "author_association": "NONE",
-    "body": "/packit production-build"
+    "body": "/packit upstream-koji-build"
   },
   "repository": {
     "id": 184635124,

tests/integration/test_babysit.py

@@ -186,7 +186,7 @@ def test_check_copr_build_updated(
         PackageConfig(
             jobs=[
                 JobConfig(
-                    type=JobType.build,
+                    type=JobType.copr_build,
                     trigger=JobConfigTriggerType.pull_request,
                     packages={"package": CommonPackageConfig(specfile_path="some.spec")},
                 ),
@@ -273,7 +273,7 @@ def test_check_copr_build_waiting_started(add_pull_request_event_with_sha_123456
         PackageConfig(
             jobs=[
                 JobConfig(
-                    type=JobType.build,
+                    type=JobType.copr_build,
                     trigger=JobConfigTriggerType.pull_request,
                     packages={"package": CommonPackageConfig(specfile_path="some.spec")},
                 ),
@@ -379,7 +379,7 @@ def test_check_copr_build_waiting_srpm_failed(add_pull_request_event_with_sha_12
         PackageConfig(
             jobs=[
                 JobConfig(
-                    type=JobType.build,
+                    type=JobType.copr_build,
                     trigger=JobConfigTriggerType.pull_request,
                     packages={"package": CommonPackageConfig(specfile_path="some.spec")},
                 ),
@@ -467,7 +467,7 @@ def test_check_copr_build_waiting_already_started(
         PackageConfig(
             jobs=[
                 JobConfig(
-                    type=JobType.build,
+                    type=JobType.copr_build,
                     trigger=JobConfigTriggerType.pull_request,
                     packages={"package": CommonPackageConfig()},
                 ),

tests/integration/test_check_rerun.py

@@ -380,7 +380,7 @@ def test_check_rerun_pr_koji_build_handler(
             [
                 {
                     "trigger": "pull_request",
-                    "job": "production_build",
+                    "job": "upstream_koji_build",
                     "metadata": {"targets": "fedora-all", "scratch": "true"},
                 },
             ],
@@ -406,22 +406,6 @@ def test_check_rerun_pr_koji_build_handler_old_job_name(
     flexmock(koji_build).should_receive("get_koji_targets").and_return(
         {"rawhide", "f34"},
     )
-    flexmock(StatusReporterGithubChecks).should_receive("set_status").with_args(
-        state=BaseCommitStatus.error,
-        description="Job name `production_build` deprecated.",
-        check_name="config-deprecation-production_build",
-        url="https://packit.dev/docs/configuration/#supported-jobs",
-        links_to_external_services=None,
-        markdown_content="The `production_build` name for upstream Koji build is misleading "
-        "because it is not used to run production/non-scratch builds and "
-        "because it can be confused with "
-        "the `koji_build` job that is triggered for dist-git commits. "
-        "(The `koji_build` job can trigger both scratch and "
-        "non-scratch/production builds.) "
-        "To be explicit, use `upstream_koji_build` for builds triggered in upstream and "
-        "`koji_build` for builds triggered in downstream.\n\n"
-        "The support for the old name will be removed by the end of the year.",
-    ).once()
     flexmock(StatusReporterGithubChecks).should_receive("set_status").with_args(
         state=BaseCommitStatus.pending,
         description=TASK_ACCEPTED,

tests/integration/test_handler.py

@@ -347,7 +347,7 @@ def test_precheck_koji_build_non_scratch(github_pr_event):
     package_config = PackageConfig(
         jobs=[
             JobConfig(
-                type=JobType.production_build,
+                type=JobType.upstream_koji_build,
                 trigger=JobConfigTriggerType.pull_request,
                 packages={
                     "package": CommonPackageConfig(
@@ -360,7 +360,7 @@ def test_precheck_koji_build_non_scratch(github_pr_event):
         packages={"package": CommonPackageConfig()},
     )
     job_config = JobConfig(
-        type=JobType.production_build,
+        type=JobType.upstream_koji_build,
         trigger=JobConfigTriggerType.pull_request,
         packages={
             "package": CommonPackageConfig(

tests/integration/test_new_hotness_update.py

@@ -215,7 +215,6 @@ def test_new_hotness_update(new_hotness_update, sync_release_model):
         create_pr=True,
         local_pr_branch_suffix="update-pull_from_upstream",
         use_downstream_specfile=True,
-        sync_default_files=False,
         add_pr_instructions=True,
         resolved_bugs=["rhbz#2106196"],
         release_monitoring_project_id=4181,
@@ -391,7 +390,6 @@ def test_new_hotness_update_non_git(new_hotness_update, sync_release_model_non_g
         create_pr=True,
         local_pr_branch_suffix="update-pull_from_upstream",
         use_downstream_specfile=True,
-        sync_default_files=False,
         add_pr_instructions=True,
         resolved_bugs=["rhbz#2106196"],
         release_monitoring_project_id=4181,

tests/integration/test_pr_comment.py

@@ -2727,7 +2727,6 @@ def _get_project(url, *_, **__):
         create_pr=True,
         local_pr_branch_suffix="update-pull_from_upstream",
         use_downstream_specfile=True,
-        sync_default_files=False,
         add_pr_instructions=True,
         resolved_bugs=["rhbz#123", "rhbz#124"],
         release_monitoring_project_id=None,
@@ -2894,7 +2893,6 @@ def _get_project(url, *_, **__):
         create_pr=True,
         local_pr_branch_suffix="update-pull_from_upstream",
         use_downstream_specfile=True,
-        sync_default_files=False,
         add_pr_instructions=True,
         resolved_bugs=["rhbz#123", "rhbz#124"],
         release_monitoring_project_id=None,

tests/integration/test_release_event.py

@@ -215,7 +215,6 @@ def test_dist_git_push_release_handle(
         create_pr=True,
         local_pr_branch_suffix="update-propose_downstream",
         use_downstream_specfile=False,
-        sync_default_files=True,
         add_pr_instructions=True,
         resolved_bugs=[],
         release_monitoring_project_id=None,
@@ -357,7 +356,6 @@ def test_dist_git_push_release_handle_multiple_branches(
             create_pr=True,
             local_pr_branch_suffix="update-propose_downstream",
             use_downstream_specfile=False,
-            sync_default_files=True,
             add_pr_instructions=True,
             resolved_bugs=[],
             release_monitoring_project_id=None,
@@ -507,7 +505,6 @@ def test_dist_git_push_release_handle_one_failed(
                 create_pr=True,
                 local_pr_branch_suffix="update-propose_downstream",
                 use_downstream_specfile=False,
-                sync_default_files=True,
                 add_pr_instructions=True,
                 resolved_bugs=[],
                 release_monitoring_project_id=None,
@@ -532,7 +529,6 @@ def test_dist_git_push_release_handle_one_failed(
                 create_pr=True,
                 local_pr_branch_suffix="update-propose_downstream",
                 use_downstream_specfile=False,
-                sync_default_files=True,
                 add_pr_instructions=True,
                 resolved_bugs=[],
                 release_monitoring_project_id=None,
@@ -785,7 +781,6 @@ def test_retry_propose_downstream_task(
         create_pr=True,
         local_pr_branch_suffix="update-propose_downstream",
         use_downstream_specfile=False,
-        sync_default_files=True,
         add_pr_instructions=True,
         resolved_bugs=[],
         release_monitoring_project_id=None,
@@ -901,7 +896,6 @@ def test_dont_retry_propose_downstream_task(
         create_pr=True,
         local_pr_branch_suffix="update-propose_downstream",
         use_downstream_specfile=False,
-        sync_default_files=True,
         add_pr_instructions=True,
         resolved_bugs=[],
         release_monitoring_project_id=None,