Skip to content

Commit

Permalink
Support creating Beaker jobs using beaker-job-group key for mrack (
Browse files Browse the repository at this point in the history
  • Loading branch information
skycastlelily committed Dec 4, 2024
1 parent ebf02ad commit 1ba2865
Show file tree
Hide file tree
Showing 3 changed files with 30 additions and 2 deletions.
5 changes: 5 additions & 0 deletions docs/releases.rst
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ Add the ``--keep`` option for the ``tmt clean guests`` command.
Users can now choose to keep the selected number of latest guests
and clean the rest to release the resources.

The :ref:`/plugins/provision/beaker` provision plugin gains
support for submitting jobs on behalf of a group through
``job-group`` key. The submitting user must be a member of
the given job group.


tmt-1.39.0
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
3 changes: 3 additions & 0 deletions tmt/schemas/provision/beaker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -49,5 +49,8 @@ properties:
beaker-job-owner:
type: string

job-group:
type: string

required:
- how
24 changes: 22 additions & 2 deletions tmt/steps/provision/mrack.py
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,14 @@ class BeakerGuestData(tmt.steps.provision.GuestSshData):
Submitting user must be a submission delegate for the ``USERNAME``.
""")

job_group: Optional[str] = field(
default=None,
option='--job-group',
metavar='GROUPNAME',
help="""
If set, Beaker jobs will be submitted on behalf of ``GROUPNAME``.
""")


@dataclasses.dataclass
class ProvisionBeakerData(BeakerGuestData, tmt.steps.provision.ProvisionStepData):
Expand Down Expand Up @@ -949,7 +957,7 @@ class CreateJobParameters:
kickstart: dict[str, str]
whiteboard: Optional[str]
beaker_job_owner: Optional[str]
group: str = 'linux'
group: Optional[str]

def to_mrack(self) -> dict[str, Any]:
data = dataclasses.asdict(self)
Expand Down Expand Up @@ -1071,6 +1079,7 @@ class GuestBeaker(tmt.steps.provision.GuestSsh):
kickstart: dict[str, str]

beaker_job_owner: Optional[str] = None
job_group: Optional[str] = None

# Provided in Beaker response
job_id: Optional[str]
Expand Down Expand Up @@ -1146,7 +1155,8 @@ def _create(self, tmt_name: str) -> None:
os=self.image,
name=f'{self.image}-{self.arch}',
whiteboard=self.whiteboard or tmt_name,
beaker_job_owner=self.beaker_job_owner)
beaker_job_owner=self.beaker_job_owner,
group=self.job_group)

try:
response = self.api.create(data)
Expand All @@ -1167,6 +1177,16 @@ def _create(self, tmt_name: str) -> None:
f"Failed to create Beaker job, job owner '{self.beaker_job_owner}' "
"is not a valid submission delegate.") from exc

if 'is not a valid group' in cause.faultString:
raise ProvisionError(
f"Failed to create Beaker job, job group '{self.job_group}' "
"was refused as unknown.") from exc

if 'is not a member of group' in cause.faultString:
raise ProvisionError(
"Failed to create Beaker job, submitting user is not "
"a member of group '{self.job_group}'") from exc

raise ProvisionError('Failed to create Beaker job') from exc

if response:
Expand Down

0 comments on commit 1ba2865

Please sign in to comment.