From f578445c108812e22c11483f0b6b3f9f914ba2ee Mon Sep 17 00:00:00 2001 From: Vector Li Date: Sat, 4 Nov 2023 22:31:53 +0800 Subject: [PATCH] Add whiteboard for beaker job Signed-off-by: Vector Li --- tmt/steps/provision/mrack.py | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/tmt/steps/provision/mrack.py b/tmt/steps/provision/mrack.py index f09bb583d3..a9b13a38bc 100644 --- a/tmt/steps/provision/mrack.py +++ b/tmt/steps/provision/mrack.py @@ -333,7 +333,8 @@ def create_host_requirement(self, host: Dict[str, Any]) -> Dict[str, Any]: if hardware and hardware.constraint: host.update({"beaker": self._translate_tmt_hw(hardware)}) req: Dict[str, Any] = super().create_host_requirement(host) - req.update({"whiteboard": host.get("tmt_name", req.get("whiteboard"))}) + whiteboard = host.get("whiteboard", host.get("tmt_name", req.get("whiteboard"))) + req.update({"whiteboard": whiteboard}) return req @@ -358,6 +359,12 @@ class BeakerGuestData(tmt.steps.provision.GuestSshData): ) # Guest request properties + whiteboard: Optional[str] = field( + default=None, + option=('-w', '--whiteboard'), + metavar='WHITEBOARD', + help='Whiteboard of beaker job.' + ) arch: str = field( default=DEFAULT_ARCH, option='--arch', @@ -559,6 +566,7 @@ def _create(self, tmt_name: str) -> None: data: Dict[str, Any] = { 'tmt_name': tmt_name, + 'whiteboard': self.whiteboard, 'hardware': self.hardware, 'name': f'{self.image}-{self.arch}', 'os': self.image,