From 3b234a5ec2254bc5ac9965d9a4d30cd3b4752258 Mon Sep 17 00:00:00 2001 From: Lili Nie Date: Tue, 5 Nov 2024 02:56:25 -0500 Subject: [PATCH 1/2] Propagate kernel options from kickstart to Beaker jobs --- tmt/steps/provision/mrack.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/tmt/steps/provision/mrack.py b/tmt/steps/provision/mrack.py index 234d528136..5f72a99d31 100644 --- a/tmt/steps/provision/mrack.py +++ b/tmt/steps/provision/mrack.py @@ -752,9 +752,6 @@ def create_host_requirement(self, host: CreateJobParameters) -> dict[str, Any]: if host.hardware and host.hardware.constraint: req.update(self._translate_tmt_hw(host.hardware)) - if host.beaker_job_owner: - req['job_owner'] = host.beaker_job_owner - # Whiteboard must be added *after* request preparation, to overwrite the default one. req['whiteboard'] = host.whiteboard @@ -898,6 +895,10 @@ def to_mrack(self) -> dict[str, Any]: if self.kickstart: data['beaker']['ks_meta'] = self.kickstart.get('metadata') data['beaker']['ks_append'] = self.kickstart + data['beaker']['kernel_options'] = self.kickstart.get('kernel_options') + data['beaker']['kernel_options_post'] = self.kickstart.get('kernel_options_post') + if self.beaker_job_owner: + data['beaker']['beaker_job_owner'] = self.beaker_job_owner return data From 2696f26069dc4492022093b9e823b482ac3ab40c Mon Sep 17 00:00:00 2001 From: Lili Nie Date: Wed, 6 Nov 2024 05:08:27 -0500 Subject: [PATCH 2/2] squash:remove job_owner part in this patch --- tmt/steps/provision/mrack.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/tmt/steps/provision/mrack.py b/tmt/steps/provision/mrack.py index 5f72a99d31..69c0aceae9 100644 --- a/tmt/steps/provision/mrack.py +++ b/tmt/steps/provision/mrack.py @@ -897,8 +897,6 @@ def to_mrack(self) -> dict[str, Any]: data['beaker']['ks_append'] = self.kickstart data['beaker']['kernel_options'] = self.kickstart.get('kernel_options') data['beaker']['kernel_options_post'] = self.kickstart.get('kernel_options_post') - if self.beaker_job_owner: - data['beaker']['beaker_job_owner'] = self.beaker_job_owner return data