Skip to content

Remap beaker group key for mrack to beaker_job_group #4199

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

Merged
bajertom merged 3 commits into from
Oct 30, 2025
Merged

Remap beaker group key for mrack to beaker_job_group #4199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b58b132
Remap beaker group key for mrack to beaker_job_group
dav-pascual Oct 16, 2025
cf51ee7
add missing mapping fix
dav-pascual Oct 22, 2025
e14b24d
update group assignment and test
dav-pascual Oct 22, 2025
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
2 changes: 1 addition & 1 deletion pyproject.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ prepare-artifact = [
"koji>=1.35.0",
]
provision-beaker = [
"mrack>=1.23.2",
"mrack>=1.25.0",
Comment thread
dav-pascual marked this conversation as resolved.
]
provision-mock = [
# mockbuild
Expand Down
10 changes: 10 additions & 0 deletions tests/provision/beaker/dry.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,16 @@ rlJournalStart
rlAssertNotGrep 'watchdog panic="ignore"/' $rlRun_LOG
rlPhaseEnd

rlPhaseStartTest "Verify that beaker-job-group is passed correctly to dry beaker job"
rlRun -s "tmt run --dry provision --how beaker --beaker-job-group test-group --image Fedora-42 plan --default"
rlAssertGrep 'group="test-group"' $rlRun_LOG
Comment thread
LecrisUT marked this conversation as resolved.
rlPhaseEnd

rlPhaseStartTest "Verify that beaker-job-group is not shown when not specified"
rlRun -s "tmt run --dry provision --how beaker --image Fedora-42 plan --default"
rlAssertNotGrep 'group="test-group"' $rlRun_LOG
rlPhaseEnd

rlPhaseStartCleanup
rlRun "popd"
rlPhaseEnd
Expand Down
7 changes: 5 additions & 2 deletions tmt/steps/provision/mrack.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1220,11 +1220,12 @@ class CreateJobParameters:
whiteboard: Optional[str]
beaker_job_owner: Optional[str]
public_key: list[str]
group: Optional[str]
beaker_job_group: Optional[str]
bootc_credentials: Optional[dict[str, Any]]
bootc_image_url: Optional[str]
bootc: bool
bootc_check_system_url: Optional[str]
group: str = 'linux'

def to_mrack(self) -> dict[str, Any]:
data = dataclasses.asdict(self)
Expand All @@ -1246,6 +1247,8 @@ def to_mrack(self) -> dict[str, Any]:
data['beaker']['ks_append'] = kickstart
if self.public_key:
data['beaker']['pubkeys'] = self.public_key
if self.beaker_job_group:
data['beaker']['beaker_job_group'] = self.beaker_job_group

return data

Expand Down Expand Up @@ -1478,7 +1481,7 @@ def start(self) -> None:
whiteboard=self.whiteboard or tmt_name,
beaker_job_owner=self.beaker_job_owner,
public_key=self.public_key,
group=self.beaker_job_group,
beaker_job_group=self.beaker_job_group,
bootc_credentials=self._bootc_registry_credentials if self.bootc else None,
bootc_image_url=self.bootc_image_url,
bootc=self.bootc,
Expand Down