Skip to content

Commit

Permalink
qa/cephfs: override testing kernel with -k option
Browse files Browse the repository at this point in the history
Normally, the fs suite overrides the kernel branch whenever the kernel client
is used, according to the matrix of configs. This prevents easily testing a new
kernel with the -k option to teuthology-suite. So, using the base config passed
to the script, detect if an alternate testing kernel is desired and use that
instead.

The scheduler still needs to do some work:

    $ teuthology-suite ... --verbose -k wip-pdonnell-i66704 --filter k-testing
    ...
    2024-10-18 00:29:43,875.875 DEBUG:teuthology.suite.merge:base kernel {'branch': 'wip-pdonnell-i66704', 'kdb': 1, 'sha1': '745cacd8f31e50d7f3b6039bbd8c9a8dfc07bf03', 'flavor': 'default'}
    2024-10-18 00:29:43,875.875 DEBUG:teuthology.suite.merge:overriding testing kernel with {'branch': 'wip-pdonnell-i66704', 'kdb': 1, 'sha1': '745cacd8f31e50d7f3b6039bbd8c9a8dfc07bf03', 'flavor': 'default'}

vs.

    $ teuthology-suite ... --verbose --filter k-testing
    ...
    2024-10-17 20:04:52,265.265 DEBUG:teuthology.suite.merge:base kernel {'branch': 'distro', 'kdb': 1, 'sha1': 'distro'}

Which will only select jobs using the "testing" kernel.

See-also: ceph/teuthology#2008
Fixes: https://tracker.ceph.com/issues/68603
Signed-off-by: Patrick Donnelly <[email protected]>
  • Loading branch information
Patrick Donnelly committed Oct 18, 2024
1 parent 93cbc92 commit 66e9dba
Showing 1 changed file with 15 additions and 0 deletions.
15 changes: 15 additions & 0 deletions qa/cephfs/mount/kclient/overrides/distro/testing/k-testing.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,18 @@
teuthology:
premerge: |
log.debug("base kernel %s", base_config.kernel)
local kernel = base_config.kernel
if kernel.branch ~= "distro" then
log.debug("overriding testing kernel with %s", kernel)
yaml_fragment.kernel.client = kernel
end
# remove the default for non-client nodes:
postmerge:
- attr(yaml.kernel).pop('branch')
- attr(yaml.kernel).pop('flavor')
- attr(yaml.kernel).pop('kdb')
- attr(yaml.kernel).pop('sha1')

kernel:
client:
branch: testing
Expand Down

0 comments on commit 66e9dba

Please sign in to comment.