Skip to content

squid: qa/cephfs: override testing kernel with -k option#61301

Merged
rishabh-d-dave merged 1 commit intoceph:squidfrom
batrick:wip-68722-squid
Oct 14, 2025
Merged

squid: qa/cephfs: override testing kernel with -k option#61301
rishabh-d-dave merged 1 commit intoceph:squidfrom
batrick:wip-68722-squid

Conversation

@batrick
Copy link
Member

@batrick batrick commented Jan 9, 2025

backport tracker: https://tracker.ceph.com/issues/68722


backport of #60386
parent tracker: https://tracker.ceph.com/issues/68603

this backport was staged using ceph-backport.sh version 16.0.0.6848
find the latest version at https://github.com/ceph/ceph/blob/main/src/script/ceph-backport.sh

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 <pdonnell@ibm.com>
(cherry picked from commit 4b084c6)
@batrick batrick added this to the squid milestone Jan 9, 2025
@batrick batrick added the tests label Jan 9, 2025
@github-actions github-actions bot added the cephfs Ceph File System label Jan 9, 2025
@batrick
Copy link
Member Author

batrick commented Jan 10, 2025

jenkins test make check

@batrick
Copy link
Member Author

batrick commented Jan 10, 2025

jenkins test api

@kotreshhr
Copy link
Contributor

This PR is under test in https://tracker.ceph.com/issues/71012.

@joscollin
Copy link
Member

This PR is under test in https://tracker.ceph.com/issues/73451.

Copy link
Contributor

@rishabh-d-dave rishabh-d-dave left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants