-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
qa/cephfs: override testing kernel with -k option
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 21, 2024
1 parent
4b54215
commit 4640901
Showing
8 changed files
with
37 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
# When the --kernel option is given to teuthology-suite, the kernel is set for | ||
# all nodes (also, the kernel is "distro" when the --kernel option is not set). | ||
# We don't generally want to use a custom kernel for all tests, so unset it. | ||
# The k-testing.yaml will set it, if given, for only the client nodes. | ||
# | ||
# Allow overriding this by using a branch ending in "-all". | ||
|
||
teuthology: | ||
postmerge: | ||
- | | ||
local branch = yaml.kernel.branch | ||
if branch and not yaml.kernel.branch:find "-all$" then | ||
log.debug("removing default kernel specification: %s", yaml.kernel) | ||
py_attrgetter(yaml.kernel).pop('branch', nil) | ||
py_attrgetter(yaml.kernel).pop('deb', nil) | ||
py_attrgetter(yaml.kernel).pop('kdb', nil) | ||
py_attrgetter(yaml.kernel).pop('koji', nil) | ||
py_attrgetter(yaml.kernel).pop('koji_task', nil) | ||
py_attrgetter(yaml.kernel).pop('rpm', nil) | ||
py_attrgetter(yaml.kernel).pop('sha1', nil) | ||
py_attrgetter(yaml.kernel).pop('tag', nil) | ||
end |
9 changes: 9 additions & 0 deletions
9
qa/cephfs/mount/kclient/overrides/distro/testing/k-testing.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
.qa/cephfs/begin/3-kernel.yaml |
1 change: 1 addition & 0 deletions
1
qa/suites/fs/upgrade/featureful_client/upgraded_client/kernel.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
.qa/cephfs/begin/3-kernel.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
.qa/cephfs/begin/3-kernel.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
.qa/cephfs/begin/3-kernel.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
.qa/cephfs/begin/3-kernel.yaml |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
.qa/cephfs/begin/3-kernel.yaml |