Skip to content

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

Merged
batrick merged 1 commit intoceph:mainfrom
batrick:i68603
Oct 25, 2024
Merged

qa/cephfs: override testing kernel with -k option#60386
batrick merged 1 commit intoceph:mainfrom
batrick:i68603

Conversation

@batrick
Copy link
Member

@batrick batrick commented Oct 17, 2024

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

Contribution Guidelines

  • To sign and title your commits, please refer to Submitting Patches to Ceph.

  • If you are submitting a fix for a stable branch (e.g. "quincy"), please refer to Submitting Patches to Ceph - Backports for the proper workflow.

  • When filling out the below checklist, you may click boxes directly in the GitHub web UI. When entering or editing the entire PR message in the GitHub web UI editor, you may also select a checklist item by adding an x between the brackets: [x]. Spaces and capitalization matter when checking off items this way.

Checklist

  • Tracker (select at least one)
    • References tracker ticket
    • Very recent bug; references commit where it was introduced
    • New feature (ticket optional)
    • Doc update (no ticket needed)
    • Code cleanup (no ticket needed)
  • Component impact
    • Affects Dashboard, opened tracker ticket
    • Affects Orchestrator, opened tracker ticket
    • No impact that needs to be tracked
  • Documentation (select at least one)
    • Updates relevant documentation
    • No doc update is appropriate
  • Tests (select at least one)
Show available Jenkins commands
  • jenkins retest this please
  • jenkins test classic perf
  • jenkins test crimson perf
  • jenkins test signed
  • jenkins test make check
  • jenkins test make check arm64
  • jenkins test submodules
  • jenkins test dashboard
  • jenkins test dashboard cephadm
  • jenkins test api
  • jenkins test docs
  • jenkins render docs
  • jenkins test ceph-volume all
  • jenkins test ceph-volume tox
  • jenkins test windows
  • jenkins test rook e2e

@batrick batrick marked this pull request as ready for review October 17, 2024 20:11
@batrick batrick requested a review from lxbsz October 17, 2024 20:11
@github-actions github-actions bot added the tests label Oct 17, 2024
@batrick batrick force-pushed the i68603 branch 3 times, most recently from 7ba7423 to 4ed31fb Compare October 18, 2024 00:31
@batrick
Copy link
Member Author

batrick commented Oct 18, 2024

teuthology dependency: ceph/teuthology#2008

@batrick batrick force-pushed the i68603 branch 6 times, most recently from ee1f437 to 817e626 Compare October 18, 2024 02:27
@batrick
Copy link
Member Author

batrick commented Oct 18, 2024

$ git fa && git co upstream/heads/fragment-merge-base-config &&  f() { teuthology-suite -t fragment-merge-base-config --machine-type smithi --email pdonnell@redhat.com --suite fs --subset $((RANDOM % 512))/512 -p 50 --force-priority --ceph wip-pdonnell-testing-20241004.144202-debug --suite-branch i68603 --suite-repo https://github.com/batrick/ceph.git  --filter k-testing --limit 1 --verbose -k wip-pdonnell-i66704    ; } ; f  |& less

https://pulpito.ceph.com/pdonnell-2024-10-18_02:27:14-fs-wip-pdonnell-testing-20241004.144202-debug-wip-pdonnell-i66704-default-smithi/

@batrick
Copy link
Member Author

batrick commented Oct 18, 2024

jenkins test make check arm64

@batrick
Copy link
Member Author

batrick commented Oct 19, 2024

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

@batrick
Copy link
Member Author

batrick commented Oct 19, 2024

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

This functions well but we're still installing the custom kernel for other nodes when not selecting the k-testing.yaml fragment. I'll write a fix for that (with an override).

batrick added a commit to batrick/ceph that referenced this pull request Oct 19, 2024
* refs/pull/60386/head:
	qa/cephfs: override testing kernel with -k option
@batrick batrick force-pushed the i68603 branch 2 times, most recently from b534069 to 5234d89 Compare October 19, 2024 17:35
@batrick
Copy link
Member Author

batrick commented Oct 19, 2024

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

This functions well but we're still installing the custom kernel for other nodes when not selecting the k-testing.yaml fragment. I'll write a fix for that (with an override).

done.

@batrick batrick force-pushed the i68603 branch 2 times, most recently from b309919 to 4640901 Compare October 21, 2024 14:45
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>
@batrick
Copy link
Member Author

batrick commented Oct 22, 2024

jenkins test make check

@batrick
Copy link
Member Author

batrick commented Oct 22, 2024

jenkins test make check arm64

@batrick
Copy link
Member Author

batrick commented Oct 22, 2024

@batrick batrick assigned vshankar and batrick and unassigned batrick Oct 22, 2024
@batrick
Copy link
Member Author

batrick commented Oct 22, 2024

jenkins test make check

2 similar comments
@batrick
Copy link
Member Author

batrick commented Oct 22, 2024

jenkins test make check

@batrick
Copy link
Member Author

batrick commented Oct 23, 2024

jenkins test make check

Copy link
Contributor

@vshankar vshankar left a comment

Choose a reason for hiding this comment

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

Nice work 👍

@batrick
Copy link
Member Author

batrick commented Oct 24, 2024

jenkins test make check

1 similar comment
@batrick
Copy link
Member Author

batrick commented Oct 25, 2024

jenkins test make check

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.

2 participants