Skip to content

[ULS] Update for Rocky version agnostic specs - #86

Open
bmastbergen wants to merge 1 commit into
mainlinefrom
{bmastbergen}_uls-el_version-fix
Open

[ULS] Update for Rocky version agnostic specs#86
bmastbergen wants to merge 1 commit into
mainlinefrom
{bmastbergen}_uls-el_version-fix

Conversation

@bmastbergen

@bmastbergen bmastbergen commented Aug 20, 2026

Copy link
Copy Markdown
Collaborator

The 6.18 spec has been updated to work with Rocky 9 or 10 and therefore does not have a hardcoded el_version anymore. Since the spec can be used to build for 9 or 10 it doesn't make sense to encode elX in the changelog at all. So if a spec defines el_version we can still add it (ie. ciq-6.12.y today), but if el_version isn't defined, just leave elX out of the changelog completely.

Coverage Report

Name Stmts Miss Branch BrPart Cover Missing
check_fips_changes.py 42 42 12 0 0% 8-67
check_kernel_commits.py 179 179 76 0 0% 3-371
ciq-cherry-pick.py 194 194 54 0 0% 1-434
ciq-tag.py 146 146 16 0 0% 3-378
ciq_tag.py 232 232 54 0 0% 1-464
jira_pr_check.py 180 180 80 0 0% 3-381
kt/ktlib/ciq_helpers.py 328 262 152 4 17% 31-51, 74-106, 124, 126->129, 129->136, 136->151, 162-172, 179-183, 187, 191-199, 208-209, 213, 217, 225-229, 240-255, 263-266, 277-314, 327-333, 346-347, 351-353, 359, 363-369, 380-382, 390-395, 404-406, 415-420, 431-444, 455-479, 489-503, 561-627, 636-646, 650-659, 669-684, 696-713
kt/ktlib/command_runner.py 33 20 6 0 33% 16, 20-33, 37-61, 65-66
kt/ktlib/config.py 59 0 16 0 100%
kt/ktlib/kernel_workspace.py 147 50 28 2 62% 24, 100, 141-143, 148-150, 153-159, 172-183, 194-204, 221-224, 228-263
kt/ktlib/kernels.py 96 13 20 1 86% 77-85, 139, 155-162
kt/ktlib/local.py 5 1 0 0 80% 12
kt/ktlib/repo.py 29 15 2 0 45% 30-31, 34-35, 43-55
kt/ktlib/ssh.py 12 5 2 0 50% 9-12, 16
kt/ktlib/util.py 17 0 0 0 100%
kt/ktlib/virt.py 80 39 10 0 46% 26, 34-37, 51-78, 82-88, 92-93, 97, 101, 105, 109, 119-127, 133-138, 142-147
kt/ktlib/vm.py 302 152 52 4 47% 127-144, 177-186, 194-205, 234-238, 253->264, 281->287, 292-302, 305-306, 319-323, 326, 329-345, 350-367, 370-377, 386-392, 400-405, 426-437, 440-441, 444, 448-453, 465-478, 491-498, 507, 516-528, 531-538, 541-550, 553
release_config.py 2 2 0 0 0% 7-27
rolling-release-update.py 264 264 106 0 0% 1-412
run_interdiff.py 165 165 56 0 0% 3-244
update_lt_spec.py 211 211 46 0 0% 9-400
TOTAL 2723 2172 788 11 18%

@bmastbergen
bmastbergen requested review from PlaidCat, kerneltoast and shreeya-patel98 and a lite review from Copilot August 20, 2026 15:58

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

This PR updates the spec-update tooling to support Rocky version-agnostic kernel specs by omitting the .elX suffix in changelog entries when the spec does not define el_version.

Changes:

  • Update update_lt_spec.py to build changelog dist as empty when el_version is not defined.
  • Change read_spec_el_version() to return None (instead of raising) when el_version is not present in the spec.

Reviewed changes

Copilot reviewed 2 out of 2 changed files in this pull request and generated 2 comments.

File Description
update_lt_spec.py Builds changelog entries without .elX when el_version is absent.
kt/ktlib/ciq_helpers.py Makes read_spec_el_version() optional by returning None when not found.

💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.

Comment thread kt/ktlib/ciq_helpers.py Outdated
Comment on lines +524 to +525
Returns the el_version string (e.g., '9'), or None if %define el_version
is not present in the spec.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Maybe valid and fair but i'm not going to block on it.

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

Updated the docstring

Comment thread kt/ktlib/ciq_helpers.py Outdated
Comment on lines +521 to +525
def read_spec_el_version(spec_lines):
"""Read the EL version number from spec file lines.

Returns the el_version string (e.g., '9').
Raises ValueError if not found.
Returns the el_version string (e.g., '9'), or None if %define el_version
is not present in the spec.

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

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

Its never had test coverage before but @bmastbergen maybe have claude gen up some coverage for possible use cases to?

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

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

some basic tests added

@PlaidCat

Copy link
Copy Markdown
Collaborator

Seem fine but the lack of test coverage on ciq_helpers.py is maybe a bit alarming, it might be good to add in some tests for this for the future.

The 6.18 spec has been updated to work with Rocky 9 or 10 and
therefore does not have a hardcoded el_version anymore.  Since
the spec can be used to build for 9 or 10 it doesn't make sense
to encode elX in the changelog at all.  So if a spec defines
el_version we can still add it (ie. ciq-6.12.y today), but if
el_version isn't defined, just leave elX out of the changelog
completely.
Copilot AI review requested due to automatic review settings August 20, 2026 16:43
@bmastbergen
bmastbergen force-pushed the {bmastbergen}_uls-el_version-fix branch from 044cc21 to 489fd63 Compare August 20, 2026 16:43

Copilot AI left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

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

Pull request overview

Copilot reviewed 3 out of 3 changed files in this pull request and generated no new comments.

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

Labels

None yet

Development

Successfully merging this pull request may close these issues.

3 participants