diff --git a/packit_service/trigger_mapping.py b/packit_service/trigger_mapping.py deleted file mode 100644 index 2a9e8a8eb..000000000 --- a/packit_service/trigger_mapping.py +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright Contributors to the Packit project. -# SPDX-License-Identifier: MIT - -from packit.config import JobType - - -def are_job_types_same(first: JobType, second: JobType) -> bool: - """ - We need to treat `build` alias in a special way. - """ - return ( - first == second - or {first, second} == {JobType.build, JobType.copr_build} - or {first, second} == {JobType.production_build, JobType.upstream_koji_build} - ) diff --git a/packit_service/worker/handlers/abstract.py b/packit_service/worker/handlers/abstract.py index aa894ea12..489a4960f 100644 --- a/packit_service/worker/handlers/abstract.py +++ b/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): ``` """ @@ -122,7 +121,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): @@ -149,7 +147,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) diff --git a/packit_service/worker/handlers/copr.py b/packit_service/worker/handlers/copr.py index 4c841fa70..27a9ff727 100644 --- a/packit_service/worker/handlers/copr.py +++ b/packit_service/worker/handlers/copr.py @@ -88,7 +88,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") @@ -151,7 +150,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" @@ -242,7 +240,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" @@ -613,7 +610,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 ( ( diff --git a/packit_service/worker/handlers/distgit.py b/packit_service/worker/handlers/distgit.py index 62391d496..b5980dc30 100644 --- a/packit_service/worker/handlers/distgit.py +++ b/packit_service/worker/handlers/distgit.py @@ -252,7 +252,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( @@ -540,7 +539,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) diff --git a/packit_service/worker/handlers/koji.py b/packit_service/worker/handlers/koji.py index 4c836e9ce..aaea6acfe 100644 --- a/packit_service/worker/handlers/koji.py +++ b/packit_service/worker/handlers/koji.py @@ -79,11 +79,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) @@ -127,7 +124,6 @@ def run(self) -> TaskResults: return self.koji_build_helper.run_koji_build() -@configured_as(job_type=JobType.production_build) @configured_as(job_type=JobType.upstream_koji_build) @reacts_to(event=KojiTaskEvent) class KojiTaskReportHandler( diff --git a/packit_service/worker/helpers/build/build_helper.py b/packit_service/worker/helpers/build/build_helper.py index 91b779721..47fce1827 100644 --- a/packit_service/worker/helpers/build/build_helper.py +++ b/packit_service/worker/helpers/build/build_helper.py @@ -29,7 +29,6 @@ ProjectEventModel, ) 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,9 +148,10 @@ 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 @@ -173,9 +173,10 @@ def job_tests_all(self) -> List[JobConfig]: if not self._job_tests_all: 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) + ): matching_jobs.append(job) self._job_tests_all = matching_jobs diff --git a/packit_service/worker/helpers/build/koji_build.py b/packit_service/worker/helpers/build/koji_build.py index c0c124647..844a67a6c 100644 --- a/packit_service/worker/helpers/build/koji_build.py +++ b/packit_service/worker/helpers/build/koji_build.py @@ -32,7 +32,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 diff --git a/packit_service/worker/helpers/sync_release/sync_release.py b/packit_service/worker/helpers/sync_release/sync_release.py index 6f5c677cb..4342c3282 100644 --- a/packit_service/worker/helpers/sync_release/sync_release.py +++ b/packit_service/worker/helpers/sync_release/sync_release.py @@ -10,7 +10,6 @@ from packit.config import aliases 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 @@ -98,7 +97,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 diff --git a/packit_service/worker/jobs.py b/packit_service/worker/jobs.py index 2cac6564b..63d142f3f 100644 --- a/packit_service/worker/jobs.py +++ b/packit_service/worker/jobs.py @@ -15,11 +15,9 @@ from ogr.exceptions import GithubAppNotInstalledError from packit.config import JobConfig, JobConfigView, JobType, JobConfigTriggerType -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 ( - DOCS_CONFIGURATION_URL, TASK_ACCEPTED, COMMENT_REACTION, PACKIT_VERIFY_FAS_COMMAND, @@ -565,18 +563,6 @@ def should_task_be_created_for_job_config_and_handler( ): 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: diff --git a/tests/data/webhooks/github/pr_comment_production_build.json b/tests/data/webhooks/github/pr_comment_production_build.json index 5458fb131..d8f9d26ca 100644 --- a/tests/data/webhooks/github/pr_comment_production_build.json +++ b/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, diff --git a/tests/integration/test_babysit.py b/tests/integration/test_babysit.py index 767c76115..aadf11070 100644 --- a/tests/integration/test_babysit.py +++ b/tests/integration/test_babysit.py @@ -163,7 +163,7 @@ def test_check_copr_build_updated( PackageConfig( jobs=[ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ) @@ -243,7 +243,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()}, ) @@ -342,7 +342,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()}, ) @@ -425,7 +425,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()}, ) diff --git a/tests/integration/test_check_rerun.py b/tests/integration/test_check_rerun.py index 932c09974..e5a4eeb30 100644 --- a/tests/integration/test_check_rerun.py +++ b/tests/integration/test_check_rerun.py @@ -379,7 +379,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"}, } ] @@ -404,22 +404,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, diff --git a/tests/integration/test_handler.py b/tests/integration/test_handler.py index db45b150f..e5232d17d 100644 --- a/tests/integration/test_handler.py +++ b/tests/integration/test_handler.py @@ -356,7 +356,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( @@ -369,7 +369,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( diff --git a/tests/integration/test_new_hotness_update.py b/tests/integration/test_new_hotness_update.py index 6b72bed65..2bfc742d3 100644 --- a/tests/integration/test_new_hotness_update.py +++ b/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, @@ -388,7 +387,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, diff --git a/tests/integration/test_pr_comment.py b/tests/integration/test_pr_comment.py index 856e55810..51c04d28d 100644 --- a/tests/integration/test_pr_comment.py +++ b/tests/integration/test_pr_comment.py @@ -2698,7 +2698,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, @@ -2866,7 +2865,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, diff --git a/tests/integration/test_release_event.py b/tests/integration/test_release_event.py index cbb0afb09..56120a0e4 100644 --- a/tests/integration/test_release_event.py +++ b/tests/integration/test_release_event.py @@ -214,7 +214,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, @@ -508,7 +506,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, @@ -777,7 +773,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, @@ -891,7 +886,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, diff --git a/tests/unit/test_build_helper.py b/tests/unit/test_build_helper.py index caffe49d1..ea6017aa2 100644 --- a/tests/unit/test_build_helper.py +++ b/tests/unit/test_build_helper.py @@ -453,7 +453,7 @@ def _mock_targets(jobs, job, job_type): pytest.param( [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"packages": CommonPackageConfig()}, ), @@ -474,7 +474,7 @@ def _mock_targets(jobs, job, job_type): pytest.param( [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -736,7 +736,7 @@ def test_configured_build_targets(jobs, job_type, build_chroots): pytest.param( [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -757,7 +757,7 @@ def test_configured_build_targets(jobs, job_type, build_chroots): pytest.param( [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -1008,7 +1008,7 @@ def test_deduced_copr_targets(): pytest.param( [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -1233,7 +1233,7 @@ def test_build_targets_overrides( pytest.param( [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -1751,7 +1751,7 @@ def test_copr_test_target2build_target(job_config, test_target, build_target): pytest.param( [ JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -1768,7 +1768,7 @@ def test_copr_test_target2build_target(job_config, test_target, build_target): pytest.param( [ JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -1832,19 +1832,19 @@ def test_koji_targets_overrides( pytest.param( [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"packages": CommonPackageConfig()}, ) ], JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"packages": CommonPackageConfig()}, ), JobConfigTriggerType.pull_request, JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"packages": CommonPackageConfig()}, ), @@ -2054,7 +2054,7 @@ def test_koji_targets_overrides( pytest.param( [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"packages": CommonPackageConfig()}, ), @@ -2065,13 +2065,13 @@ def test_koji_targets_overrides( ), ], JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"packages": CommonPackageConfig()}, ), JobConfigTriggerType.pull_request, JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"packages": CommonPackageConfig()}, ), @@ -2301,7 +2301,7 @@ def test_build_handler_job_and_test_properties( pytest.param( [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -2698,7 +2698,7 @@ def test_check_if_custom_copr_can_be_used_and_report( pytest.param( [ JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -2715,7 +2715,7 @@ def test_check_if_custom_copr_can_be_used_and_report( pytest.param( [ JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.commit, packages={ "package": CommonPackageConfig( @@ -2733,7 +2733,7 @@ def test_check_if_custom_copr_can_be_used_and_report( pytest.param( [ JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.release, packages={ "package": CommonPackageConfig( diff --git a/tests/unit/test_jobs.py b/tests/unit/test_jobs.py index c244afc1a..34885ff7c 100644 --- a/tests/unit/test_jobs.py +++ b/tests/unit/test_jobs.py @@ -81,7 +81,7 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -121,7 +121,7 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), @@ -135,7 +135,7 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -148,7 +148,7 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.commit), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), @@ -161,7 +161,7 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.commit), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), @@ -174,7 +174,7 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.release), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={"package": CommonPackageConfig()}, ), @@ -214,7 +214,7 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -227,7 +227,7 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -255,78 +255,78 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), ], {KojiBuildHandler}, - id="config=production_build_for_pr&pull_request&PullRequestGithubEvent", + id="config=upstream_koji_build_for_pr&pull_request&PullRequestGithubEvent", ), pytest.param( MergeRequestGitlabEvent, flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), ], {KojiBuildHandler}, - id="config=production_build_for_pr&pull_request&MergeRequestGitlabEvent", + id="config=upstream_koji_build_for_pr&pull_request&MergeRequestGitlabEvent", ), pytest.param( PushGitHubEvent, flexmock(job_config_trigger_type=JobConfigTriggerType.commit), [ JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), ], {KojiBuildHandler}, - id="config=production_build_for_commit&commit&PushGitHubEvent", + id="config=upstream_koji_build_for_commit&commit&PushGitHubEvent", ), pytest.param( PushGitlabEvent, flexmock(job_config_trigger_type=JobConfigTriggerType.commit), [ JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), ], {KojiBuildHandler}, - id="config=production_build_for_commit&commit&PushGitlabEvent", + id="config=upstream_koji_build_for_commit&commit&PushGitlabEvent", ), pytest.param( ReleaseEvent, flexmock(job_config_trigger_type=JobConfigTriggerType.release), [ JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.release, packages={"package": CommonPackageConfig()}, ), ], {KojiBuildHandler}, - id="config=production_build_for_release&commit&ReleaseEvent", + id="config=upstream_koji_build_for_release&commit&ReleaseEvent", ), pytest.param( KojiTaskEvent, flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), ], {KojiTaskReportHandler}, - id="config=production_build_for_pr&pull_request&KojiBuildEvent", + id="config=upstream_koji_build_for_pr&pull_request&KojiBuildEvent", ), # Build and test: pytest.param( @@ -334,7 +334,7 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -352,7 +352,7 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -370,7 +370,7 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -388,7 +388,7 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -407,17 +407,17 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={"package": CommonPackageConfig()}, ), @@ -431,17 +431,17 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.commit), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={"package": CommonPackageConfig()}, ), @@ -454,17 +454,17 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.release), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={"package": CommonPackageConfig()}, ), @@ -478,12 +478,12 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.release), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), @@ -497,7 +497,7 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -507,12 +507,12 @@ packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={"package": CommonPackageConfig()}, ), @@ -566,7 +566,7 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.commit), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -576,12 +576,12 @@ packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={"package": CommonPackageConfig()}, ), @@ -595,7 +595,7 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -605,12 +605,12 @@ packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={"package": CommonPackageConfig()}, ), @@ -624,7 +624,7 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -634,12 +634,12 @@ packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={"package": CommonPackageConfig()}, ), @@ -653,7 +653,7 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -663,12 +663,12 @@ packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={"package": CommonPackageConfig()}, ), @@ -682,7 +682,7 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.commit), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -692,12 +692,12 @@ packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={"package": CommonPackageConfig()}, ), @@ -717,12 +717,12 @@ packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={"package": CommonPackageConfig()}, ), @@ -741,12 +741,12 @@ packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={"package": CommonPackageConfig()}, ), @@ -765,12 +765,12 @@ packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={"package": CommonPackageConfig()}, ), @@ -789,12 +789,12 @@ packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={"package": CommonPackageConfig()}, ), @@ -809,18 +809,18 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), ], {CoprBuildHandler, KojiBuildHandler}, - id="config=build_for_pr+production_build_for_pr" + id="config=build_for_pr+upstream_koji_build_for_pr" "&pull_request&PullRequestGithubEvent", ), pytest.param( @@ -828,18 +828,18 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), ], {CoprBuildStartHandler}, - id="config=build_for_pr+production_build_for_pr" + id="config=build_for_pr+upstream_koji_build_for_pr" "&pull_request&CoprBuildStartEvent", ), pytest.param( @@ -847,18 +847,18 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), ], {KojiTaskReportHandler}, - id="config=build_for_pr+production_build_for_pr" + id="config=build_for_pr+upstream_koji_build_for_pr" "&pull_request&KojiBuildEvent", ), pytest.param( @@ -918,7 +918,7 @@ flexmock(job_config_trigger_type=JobConfigTriggerType.release), [ JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.release, packages={"package": CommonPackageConfig()}, ), @@ -978,7 +978,7 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -994,7 +994,7 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -1010,7 +1010,7 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -1042,7 +1042,7 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -1085,18 +1085,18 @@ def packages_config(self): ), pytest.param( PullRequestCommentGithubEvent, - "/packit production-build", + "/packit upstream-koji-build", "/packit", flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), ], {KojiBuildHandler}, - id="config=production_build_for_pr&pull_request&PullRequestCommentGithubEvent" + id="config=upstream_koji_build_for_pr&pull_request&PullRequestCommentGithubEvent" "&packit_production-build", ), pytest.param( @@ -1146,7 +1146,7 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -1162,7 +1162,7 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -1217,7 +1217,7 @@ def packages_config(self): None, [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -1232,7 +1232,7 @@ def packages_config(self): "the-identifier", [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -1252,7 +1252,7 @@ def packages_config(self): None, [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -1272,7 +1272,7 @@ def packages_config(self): "the-identifier", [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -1298,18 +1298,18 @@ def packages_config(self): ), pytest.param( CheckRerunPullRequestEvent, - "production-build", + "koji-build", flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), None, [ JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), ], {KojiBuildHandler}, - id="config=production_build_for_pr&pull_request&CheckRerunPullRequestEvent", + id="config=upstream_koji_build_for_pr&pull_request&CheckRerunPullRequestEvent", ), pytest.param( CheckRerunCommitEvent, @@ -1318,7 +1318,7 @@ def packages_config(self): None, [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={"package": CommonPackageConfig()}, ), @@ -1343,33 +1343,33 @@ def packages_config(self): ), pytest.param( CheckRerunReleaseEvent, - "production-build", + "koji-build", flexmock(job_config_trigger_type=JobConfigTriggerType.release), None, [ JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.release, packages={"package": CommonPackageConfig()}, ), ], {KojiBuildHandler}, - id="config=production_build_for_release&pull_request&CheckRerunCommitEvent", + id="config=upstream_koji_build_for_release&pull_request&CheckRerunCommitEvent", ), pytest.param( CheckRerunReleaseEvent, - "production-build", + "koji-build", flexmock(job_config_trigger_type=JobConfigTriggerType.release), None, [ JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.release, packages={"package": CommonPackageConfig()}, ), ], {KojiBuildHandler}, - id="config=production_build_for_release&pull_request&CheckRerunCommitEvent", + id="config=upstream_koji_build_for_release&pull_request&CheckRerunCommitEvent", ), ], ) @@ -1411,14 +1411,14 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ) ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ) @@ -1431,14 +1431,14 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ) ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ) @@ -1451,14 +1451,14 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ) ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ) @@ -1487,7 +1487,7 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -1499,7 +1499,7 @@ def packages_config(self): ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ) @@ -1518,14 +1518,14 @@ def packages_config(self): packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ) @@ -1539,7 +1539,7 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -1548,7 +1548,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -1559,7 +1559,7 @@ def packages_config(self): ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -1568,7 +1568,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -1586,7 +1586,7 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -1595,7 +1595,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={ "package": CommonPackageConfig( @@ -1604,7 +1604,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={ "package": CommonPackageConfig( @@ -1615,7 +1615,7 @@ def packages_config(self): ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -1633,7 +1633,7 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.commit), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -1642,7 +1642,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={ "package": CommonPackageConfig( @@ -1651,7 +1651,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={ "package": CommonPackageConfig( @@ -1662,7 +1662,7 @@ def packages_config(self): ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={ "package": CommonPackageConfig( @@ -1680,7 +1680,7 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.release), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -1689,7 +1689,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={ "package": CommonPackageConfig( @@ -1698,7 +1698,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={ "package": CommonPackageConfig( @@ -1709,7 +1709,7 @@ def packages_config(self): ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={ "package": CommonPackageConfig( @@ -1737,7 +1737,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={ "package": CommonPackageConfig( @@ -1746,7 +1746,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={ "package": CommonPackageConfig( @@ -1774,7 +1774,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={ "package": CommonPackageConfig( @@ -1783,7 +1783,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={ "package": CommonPackageConfig( @@ -1794,7 +1794,7 @@ def packages_config(self): ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={ "package": CommonPackageConfig( @@ -1821,7 +1821,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={ "package": CommonPackageConfig( @@ -1830,7 +1830,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={ "package": CommonPackageConfig( @@ -1841,7 +1841,7 @@ def packages_config(self): ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={ "package": CommonPackageConfig( @@ -1868,7 +1868,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={ "package": CommonPackageConfig( @@ -1877,7 +1877,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={ "package": CommonPackageConfig( @@ -1907,7 +1907,7 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -1925,7 +1925,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={ "package": CommonPackageConfig( @@ -1934,7 +1934,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={ "package": CommonPackageConfig( @@ -1945,7 +1945,7 @@ def packages_config(self): ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -1963,7 +1963,7 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.commit), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -1981,7 +1981,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={ "package": CommonPackageConfig( @@ -1990,7 +1990,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={ "package": CommonPackageConfig( @@ -2001,7 +2001,7 @@ def packages_config(self): ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={ "package": CommonPackageConfig( @@ -2019,7 +2019,7 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.release), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -2037,7 +2037,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={ "package": CommonPackageConfig( @@ -2046,7 +2046,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={ "package": CommonPackageConfig( @@ -2057,7 +2057,7 @@ def packages_config(self): ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={ "package": CommonPackageConfig( @@ -2075,7 +2075,7 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -2093,7 +2093,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={ "package": CommonPackageConfig( @@ -2102,7 +2102,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={ "package": CommonPackageConfig( @@ -2113,7 +2113,7 @@ def packages_config(self): ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -2131,7 +2131,7 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -2149,7 +2149,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={ "package": CommonPackageConfig( @@ -2158,7 +2158,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={ "package": CommonPackageConfig( @@ -2169,7 +2169,7 @@ def packages_config(self): ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -2187,7 +2187,7 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -2205,7 +2205,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.commit, packages={ "package": CommonPackageConfig( @@ -2214,7 +2214,7 @@ def packages_config(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.release, packages={ "package": CommonPackageConfig( @@ -2244,24 +2244,24 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ) ], - id="build_for_pr+production_build_for_pr&CoprBuildHandler&PullRequestGithubEvent", + id="build_for_pr+upstream_koji_build_for_pr&CoprBuildHandler&PullRequestGithubEvent", ), pytest.param( KojiBuildHandler, @@ -2269,24 +2269,24 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), ], [ JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ) ], - id="build_for_pr+production_build_for_pr&KojiBuildHandler&PullRequestGithubEvent", + id="build_for_pr+upstream_koji_build_for_pr&KojiBuildHandler&PullRequestGithubEvent", ), pytest.param( KojiTaskReportHandler, @@ -2294,24 +2294,24 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), ], [ JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ) ], - id="build_for_pr+production_build_for_pr&KojiBuildReportHandler&KojiBuildEvent", + id="build_for_pr+upstream_koji_build_for_pr&KojiBuildReportHandler&KojiBuildEvent", ), # comments: pytest.param( @@ -2320,14 +2320,14 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ) ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ) @@ -2340,14 +2340,14 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ) ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ) @@ -2360,14 +2360,14 @@ def packages_config(self): flexmock(job_config_trigger_type=JobConfigTriggerType.pull_request), [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ) ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ) @@ -2577,13 +2577,13 @@ def packages_config(self): ), pytest.param( PullRequestCommentGithubEvent, - "/packit production-build", + "/packit upstream-koji-build", "/packit", {KojiBuildHandler}, ), pytest.param( PullRequestCommentGithubEvent, - "/packit-stg production-build", + "/packit-stg upstream-koji-build", "/packit-stg", {KojiBuildHandler}, ), @@ -2625,7 +2625,7 @@ def __init__(self): ), pytest.param( CheckRerunPullRequestEvent, - "production-build", + "koji-build", {KojiBuildHandler}, ), ], @@ -2707,7 +2707,7 @@ def __init__(self): JobConfigTriggerType.pull_request, [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -2719,7 +2719,7 @@ def __init__(self): ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -2731,7 +2731,7 @@ def __init__(self): JobConfigTriggerType.release, [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -2755,7 +2755,7 @@ def __init__(self): JobConfigTriggerType.release, [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -2784,7 +2784,7 @@ def __init__(self): JobConfigTriggerType.release, [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={"package": CommonPackageConfig()}, ), @@ -3096,7 +3096,7 @@ def __init__(self): JobConfigTriggerType.pull_request, [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -3105,7 +3105,7 @@ def __init__(self): }, ), JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( @@ -3116,7 +3116,7 @@ def __init__(self): ], [ JobConfig( - type=JobType.build, + type=JobType.copr_build, trigger=JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( diff --git a/tests/unit/test_srpm_logs.py b/tests/unit/test_srpm_logs.py index fd5a171d3..155361300 100644 --- a/tests/unit/test_srpm_logs.py +++ b/tests/unit/test_srpm_logs.py @@ -46,7 +46,7 @@ def build_helper( jobs = jobs or [] jobs.append( JobConfig( - type=JobType.production_build, + type=JobType.upstream_koji_build, trigger=trigger or JobConfigTriggerType.pull_request, packages={ "package": CommonPackageConfig( diff --git a/tests/unit/test_steve.py b/tests/unit/test_steve.py index 904b0ea71..883c25b9a 100644 --- a/tests/unit/test_steve.py +++ b/tests/unit/test_steve.py @@ -184,7 +184,6 @@ def test_process_message(event, private, enabled_private_namespaces, success): 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,