Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Do not run jobs when manual_trigger=True #2069

Merged
merged 1 commit into from
May 30, 2023
Merged

Do not run jobs when manual_trigger=True #2069

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 11 additions & 0 deletions packit_service/worker/jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,9 @@
logger = logging.getLogger(__name__)


MANUAL_EVENTS = [AbstractCommentEvent, CheckRerunEvent]


def get_handlers_for_comment(
comment: str, packit_comment_command_prefix: str
) -> Set[Type[JobHandler]]:
Expand Down Expand Up @@ -614,6 +617,14 @@ def get_jobs_matching_event(self) -> List[JobConfig]:
or self.event.job_identifier == job.identifier
)
and job not in jobs_matching_trigger
# Manual trigger condition
and (
not job.manual_trigger
or any(
isinstance(self.event, event_type)
for event_type in MANUAL_EVENTS
)
)
):
jobs_matching_trigger.append(job)

Expand Down
2 changes: 2 additions & 0 deletions tests/unit/test_babysit_vm_image.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,7 @@ def test_update_vm_image_build(stop_babysitting, build_status, vm_image_builder_
flexmock(
trigger=JobConfigTriggerType.pull_request,
type=JobType.vm_image_build,
manual_trigger=False,
)
],
)
Expand Down Expand Up @@ -156,6 +157,7 @@ def test_update_vm_image_build(stop_babysitting, build_status, vm_image_builder_
get_pr_id=lambda: 21,
owner="owner",
commit_sha="123456",
manual_trigger=False,
),
)
== stop_babysitting
Expand Down
300 changes: 300 additions & 0 deletions tests/unit/test_jobs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@
CheckRerunPullRequestEvent,
CheckRerunReleaseEvent,
ReleaseGitlabEvent,
CheckRerunEvent,
)
from packit_service.worker.events.koji import KojiBuildEvent
from packit_service.worker.handlers import (
Expand Down Expand Up @@ -2650,6 +2651,7 @@ def __init__(self):
@pytest.mark.parametrize(
"event_kls,job_config_trigger_type,jobs,result,kwargs",
[
# GitHub comment event tests
pytest.param(
PullRequestCommentGithubEvent,
JobConfigTriggerType.pull_request,
Expand Down Expand Up @@ -2745,6 +2747,252 @@ def __init__(self):
[],
{},
),
pytest.param(
PullRequestCommentGithubEvent,
JobConfigTriggerType.pull_request,
[
JobConfig(
type=JobType.bodhi_update,
trigger=JobConfigTriggerType.pull_request,
packages={"package": CommonPackageConfig()},
manual_trigger=False,
),
JobConfig(
type=JobType.propose_downstream,
trigger=JobConfigTriggerType.release,
packages={"package": CommonPackageConfig()},
),
],
[
JobConfig(
type=JobType.bodhi_update,
trigger=JobConfigTriggerType.pull_request,
packages={"package": CommonPackageConfig()},
manual_trigger=False,
),
],
{},
),
pytest.param(
PullRequestCommentGithubEvent,
JobConfigTriggerType.pull_request,
[
JobConfig(
type=JobType.bodhi_update,
trigger=JobConfigTriggerType.pull_request,
packages={"package": CommonPackageConfig()},
manual_trigger=False,
),
],
[
JobConfig(
type=JobType.bodhi_update,
trigger=JobConfigTriggerType.pull_request,
packages={"package": CommonPackageConfig()},
manual_trigger=False,
),
],
{},
),
pytest.param(
PullRequestCommentGithubEvent,
JobConfigTriggerType.release,
[
JobConfig(
type=JobType.bodhi_update,
trigger=JobConfigTriggerType.release,
packages={"package": CommonPackageConfig()},
manual_trigger=True,
),
],
[
JobConfig(
type=JobType.bodhi_update,
trigger=JobConfigTriggerType.release,
packages={"package": CommonPackageConfig()},
manual_trigger=True,
),
],
{},
),
pytest.param(
PullRequestGithubEvent,
JobConfigTriggerType.pull_request,
[
JobConfig(
type=JobType.tests,
trigger=JobConfigTriggerType.pull_request,
packages={"package": CommonPackageConfig()},
manual_trigger=True,
),
JobConfig(
type=JobType.tests,
trigger=JobConfigTriggerType.pull_request,
packages={"package": CommonPackageConfig()},
manual_trigger=False,
),
],
[
JobConfig(
type=JobType.tests,
trigger=JobConfigTriggerType.pull_request,
packages={"package": CommonPackageConfig()},
manual_trigger=False,
),
],
{},
),
pytest.param(
ReleaseEvent,
JobConfigTriggerType.release,
[
JobConfig(
type=JobType.tests,
trigger=JobConfigTriggerType.release,
packages={"package": CommonPackageConfig()},
manual_trigger=True,
),
JobConfig(
type=JobType.tests,
trigger=JobConfigTriggerType.release,
packages={"package": CommonPackageConfig()},
manual_trigger=False,
),
],
[
JobConfig(
type=JobType.tests,
trigger=JobConfigTriggerType.release,
packages={"package": CommonPackageConfig()},
manual_trigger=False,
),
],
{},
),
# GitLab comment event tests
pytest.param(
MergeRequestCommentGitlabEvent,
JobConfigTriggerType.pull_request,
[
JobConfig(
type=JobType.bodhi_update,
trigger=JobConfigTriggerType.pull_request,
packages={"package": CommonPackageConfig()},
manual_trigger=False,
),
JobConfig(
type=JobType.propose_downstream,
trigger=JobConfigTriggerType.release,
packages={"package": CommonPackageConfig()},
),
],
[
JobConfig(
type=JobType.bodhi_update,
trigger=JobConfigTriggerType.pull_request,
packages={"package": CommonPackageConfig()},
manual_trigger=False,
),
],
{},
),
pytest.param(
MergeRequestCommentGitlabEvent,
JobConfigTriggerType.pull_request,
[
JobConfig(
type=JobType.bodhi_update,
trigger=JobConfigTriggerType.pull_request,
packages={"package": CommonPackageConfig()},
manual_trigger=False,
),
],
[
JobConfig(
type=JobType.bodhi_update,
trigger=JobConfigTriggerType.pull_request,
packages={"package": CommonPackageConfig()},
manual_trigger=False,
),
],
{},
),
pytest.param(
MergeRequestCommentGitlabEvent,
JobConfigTriggerType.release,
[
JobConfig(
type=JobType.bodhi_update,
trigger=JobConfigTriggerType.release,
packages={"package": CommonPackageConfig()},
manual_trigger=True,
),
],
[
JobConfig(
type=JobType.bodhi_update,
trigger=JobConfigTriggerType.release,
packages={"package": CommonPackageConfig()},
manual_trigger=True,
),
],
{},
),
pytest.param(
MergeRequestGitlabEvent,
JobConfigTriggerType.pull_request,
[
JobConfig(
type=JobType.tests,
trigger=JobConfigTriggerType.pull_request,
packages={"package": CommonPackageConfig()},
manual_trigger=True,
),
JobConfig(
type=JobType.tests,
trigger=JobConfigTriggerType.pull_request,
packages={"package": CommonPackageConfig()},
manual_trigger=False,
),
],
[
JobConfig(
type=JobType.tests,
trigger=JobConfigTriggerType.pull_request,
packages={"package": CommonPackageConfig()},
manual_trigger=False,
),
],
{},
),
pytest.param(
ReleaseGitlabEvent,
JobConfigTriggerType.release,
[
JobConfig(
type=JobType.tests,
trigger=JobConfigTriggerType.release,
packages={"package": CommonPackageConfig()},
manual_trigger=True,
),
JobConfig(
type=JobType.tests,
trigger=JobConfigTriggerType.release,
packages={"package": CommonPackageConfig()},
manual_trigger=False,
),
],
[
JobConfig(
type=JobType.tests,
trigger=JobConfigTriggerType.release,
packages={"package": CommonPackageConfig()},
manual_trigger=False,
),
],
{},
),
# Pagure comment event tests
pytest.param(
PullRequestCommentPagureEvent,
JobConfigTriggerType.pull_request,
Expand Down Expand Up @@ -2841,6 +3089,7 @@ def __init__(self):
identifier="first",
)
},
manual_trigger=True,
),
],
[
Expand All @@ -2852,6 +3101,7 @@ def __init__(self):
identifier="first",
)
},
manual_trigger=True,
),
],
{},
Expand Down Expand Up @@ -2894,6 +3144,56 @@ def __init__(self):
],
{"issue_id": 1},
),
# Common re-run event
pytest.param(
CheckRerunEvent,
JobConfigTriggerType.pull_request,
[
JobConfig(
type=JobType.tests,
trigger=JobConfigTriggerType.pull_request,
packages={
"package": CommonPackageConfig(
identifier="first",
)
},
manual_trigger=True,
),
JobConfig(
type=JobType.tests,
trigger=JobConfigTriggerType.pull_request,
packages={
"package": CommonPackageConfig(
identifier="first",
)
},
manual_trigger=False,
),
],
[
JobConfig(
type=JobType.tests,
trigger=JobConfigTriggerType.pull_request,
packages={
"package": CommonPackageConfig(
identifier="first",
)
},
manual_trigger=True,
),
JobConfig(
type=JobType.tests,
trigger=JobConfigTriggerType.pull_request,
packages={
"package": CommonPackageConfig(
identifier="first",
)
},
manual_trigger=False,
),
],
{"job_identifier": "first"},
),
],
)
def test_get_jobs_matching_trigger(
Expand Down
Loading