From dd43a5ab4a1789e911ef0423e2792f6edb506528 Mon Sep 17 00:00:00 2001 From: David Pascual Date: Wed, 15 Oct 2025 15:59:33 +0200 Subject: [PATCH 1/2] fix: Revert commit 0cabc75 This reverts commit 0cabc75ff768bebb4287391b263fcefefb613f31. Fixes https://github.com/neoave/mrack/issues/304 Signed-off-by: David Pascual --- src/mrack/transformers/beaker.py | 2 +- tests/unit/test_beaker_transformer.py | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/mrack/transformers/beaker.py b/src/mrack/transformers/beaker.py index 4d31c6dd..9485e521 100644 --- a/src/mrack/transformers/beaker.py +++ b/src/mrack/transformers/beaker.py @@ -204,7 +204,7 @@ 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, diff --git a/tests/unit/test_beaker_transformer.py b/tests/unit/test_beaker_transformer.py index 72c9132e..039feae1 100644 --- a/tests/unit/test_beaker_transformer.py +++ b/tests/unit/test_beaker_transformer.py @@ -197,7 +197,6 @@ async def create_transformer(self, legacy=False): "variant": "Server", "ks_meta": "FEDORA_HOST_KS_META", "job_owner": "FEDORA", - "job_group": "client", "ks_append": maximal_ksappend, "kernel_options": "FEDORA_KERNEL_OPTIONS", "kernel_options_post": "FEDORA_KERNEL_OPTIONS_POST", @@ -217,7 +216,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, @@ -232,7 +230,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, @@ -248,7 +245,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, @@ -266,7 +262,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", @@ -282,7 +277,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" From 6c06d3fae6fa62ccf17806817475d59a3b20dd0c Mon Sep 17 00:00:00 2001 From: David Pascual Date: Wed, 15 Oct 2025 16:49:50 +0200 Subject: [PATCH 2/2] feat: Add support for Beaker group key Add support for Beaker group key https://beaker-project.org/docs/user-guide/interface/groups.html Signed-off-by: David Pascual --- src/mrack/transformers/beaker.py | 3 +++ tests/unit/test_beaker_transformer.py | 4 +++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/mrack/transformers/beaker.py b/src/mrack/transformers/beaker.py index 9485e521..aa1f93d1 100644 --- a/src/mrack/transformers/beaker.py +++ b/src/mrack/transformers/beaker.py @@ -209,6 +209,9 @@ def create_host_requirement(self, 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), diff --git a/tests/unit/test_beaker_transformer.py b/tests/unit/test_beaker_transformer.py index 039feae1..321bf90b 100644 --- a/tests/unit/test_beaker_transformer.py +++ b/tests/unit/test_beaker_transformer.py @@ -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", @@ -197,6 +198,7 @@ async def create_transformer(self, legacy=False): "variant": "Server", "ks_meta": "FEDORA_HOST_KS_META", "job_owner": "FEDORA", + "job_group": "linux-engineering", "ks_append": maximal_ksappend, "kernel_options": "FEDORA_KERNEL_OPTIONS", "kernel_options_post": "FEDORA_KERNEL_OPTIONS_POST",