Skip to content

fix: Revert "group" changes in Beaker transformer and introduce new "beaker_job_group" key #325

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
dav-pascual merged 2 commits into from
Oct 21, 2025
Merged

fix: Revert "group" changes in Beaker transformer and introduce new "beaker_job_group" key #325

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dd43a5a
fix: Revert commit 0cabc75
dav-pascual Oct 15, 2025
6c06d3f
feat: Add support for Beaker group key
dav-pascual Oct 15, 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
5 changes: 4 additions & 1 deletion src/mrack/transformers/beaker.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,11 +204,14 @@ def create_host_requirement(self, host):
"name": host["name"],
"distro": distro,
"os": host["os"],
"job_group": host["group"],
"group": host["group"],
"meta_distro": "distro" in host,
"arch": host.get("arch", "x86_64"),
"variant": variant,
"job_owner": host.get(CONFIG_KEY, {}).get("beaker_job_owner"),
"job_group": host.get(CONFIG_KEY, {}).get(
"beaker_job_group"
), # Beaker group of users
"ks_meta": self._get_ks_meta(host),
"kernel_options": self._get_kernel_options(host),
"kernel_options_post": self._get_kernel_options_post(host),
Expand Down
10 changes: 3 additions & 7 deletions tests/unit/test_beaker_transformer.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,8 @@ class TestBeakerTransformer:
"ks_meta": "FEDORA_HOST_KS_META",
"kernel_options": "FEDORA_KERNEL_OPTIONS",
"kernel_options_post": "FEDORA_KERNEL_OPTIONS_POST",
"job_owner": "FEDORA",
"beaker_job_owner": "FEDORA",
"beaker_job_group": "linux-engineering",
"ks_append": {
"pre-install": "%pre\npre_dummy\n%end",
"script": "script_dummy",
Expand Down Expand Up @@ -197,7 +198,7 @@ async def create_transformer(self, legacy=False):
"variant": "Server",
"ks_meta": "FEDORA_HOST_KS_META",
"job_owner": "FEDORA",
"job_group": "client",
"job_group": "linux-engineering",
"ks_append": maximal_ksappend,
"kernel_options": "FEDORA_KERNEL_OPTIONS",
"kernel_options_post": "FEDORA_KERNEL_OPTIONS_POST",
Expand All @@ -217,7 +218,6 @@ async def create_transformer(self, legacy=False):
"distro": "Fedora-36%",
"variant": "Server",
"ks_meta": "FEDORA_HOST_KS_META",
"job_group": "server",
"ks_append": default_ks_append,
"whiteboard": default_whiteboard,
"priority": default_prio,
Expand All @@ -232,7 +232,6 @@ async def create_transformer(self, legacy=False):
{
"distro": "CentOS-Stream-9%",
"variant": "BaseOS",
"job_group": "ipaserver",
"ks_meta": "PROV_CONF_CENTOS_KS_META",
"ks_append": ["%post\ncat /etc/redhat-release\n%end"],
"whiteboard": default_whiteboard,
Expand All @@ -248,7 +247,6 @@ async def create_transformer(self, legacy=False):
{
"distro": "CentOS-Stream-9%",
"variant": "BaseOS",
"job_group": "ipaclient",
"ks_meta": "PROV_CONF_CENTOS_KS_META",
"ks_append": ["%post\ncat /etc/redhat-release\n%end"],
"whiteboard": default_whiteboard,
Expand All @@ -266,7 +264,6 @@ async def create_transformer(self, legacy=False):
{
"distro": "win-2022",
"variant": "BaseOS",
"job_group": "ad_root",
"ks_meta": "PROV_CONF_DEFAULT",
"ks_append": default_ks_append,
"whiteboard": "BEAKER DOES NOT SUPPORT WINDOWS THIS JOB MUST FAIL",
Expand All @@ -282,7 +279,6 @@ async def create_transformer(self, legacy=False):
{
"distro": "RHEL-8.6%",
"variant": "BaseOS",
"job_group": "ipaserver",
"ks_meta": "PROV_CONF_RHEL86_KS_META",
"ks_append": [
"%post\ncat /etc/redhat-release\nwget redhat.com\n%end"
Expand Down