From 5bac476685eacea5a62f470286b7af6032f2a687 Mon Sep 17 00:00:00 2001 From: Patrick Donnelly Date: Thu, 17 Oct 2024 15:59:07 -0400 Subject: [PATCH] teuthology/suite: set the kernel branch in the kernel config For inspection by scripts. Signed-off-by: Patrick Donnelly --- teuthology/suite/run.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/teuthology/suite/run.py b/teuthology/suite/run.py index 7f5a1c94b..cc6859b73 100644 --- a/teuthology/suite/run.py +++ b/teuthology/suite/run.py @@ -167,13 +167,16 @@ def choose_kernel(self): # Put together a stanza specifying the kernel hash if self.args.kernel_branch == 'distro': kernel_hash = 'distro' + kernel_branch = 'distro' # Skip the stanza if '-k none' is given elif self.args.kernel_branch is None or \ self.args.kernel_branch.lower() == 'none': kernel_hash = None + kernel_branch = None else: + kernel_branch = self.args.kernel_branch kernel_hash = util.get_gitbuilder_hash( - 'kernel', self.args.kernel_branch, 'default', + 'kernel', kernel_branch, 'default', self.args.machine_type, self.args.distro, self.args.distro_version, ) @@ -189,7 +192,7 @@ def choose_kernel(self): if kernel_hash: log.info("kernel sha1: {hash}".format(hash=kernel_hash)) - kernel_dict = dict(kernel=dict(kdb=kdb, sha1=kernel_hash)) + kernel_dict = dict(kernel=dict(branch=kernel_branch, kdb=kdb, sha1=kernel_hash)) if kernel_hash != 'distro': kernel_dict['kernel']['flavor'] = 'default' else: