Skip to content

kola: stop treating scos and rhcos as the same distro#4580

Open
nikita-dubrovskii wants to merge 3 commits into
coreos:mainfrom
nikita-dubrovskii:separate_rhcos_scos
Open

kola: stop treating scos and rhcos as the same distro#4580
nikita-dubrovskii wants to merge 3 commits into
coreos:mainfrom
nikita-dubrovskii:separate_rhcos_scos

Conversation

@nikita-dubrovskii

Copy link
Copy Markdown
Contributor

Despite SCOS and RHCOS being largely similar, we want to limit some tests (like iso.iso-fips) for RHCOS only.

Issue: #4555

Despite SCOS and RHCOS being largely similar, we want to limit
some tests (like iso.iso-fips) for RHCOS only.

@gemini-code-assist gemini-code-assist Bot left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

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

Code Review

This pull request decouples the "scos" distribution from "rhcos" in the test suite, allowing it to be treated as its own distinct distribution rather than mapping it to "rhcos". This change updates numerous tests to explicitly include or exclude "scos" alongside "rhcos". A typo was identified in mantle/kola/tests/fips/hmac.go where "scsos" was written instead of "scos".

Important

The consumer version of Gemini Code Assist on GitHub is being sunset. Starting June 18, 2026, new organization installations will be blocked, and all code review activity will officially cease on July 17, 2026.
For more details on the timeline and next steps, please review the Help Documentation.

Comment thread mantle/kola/tests/fips/hmac.go Outdated
Previously, SCOS was treated as RHCOS and these tests ran on SCOS.
After separating SCOS as a distinct distro, explicitly add SCOS to
tests compatible with both distributions while keeping some tests
(like iso.iso-fips) RHCOS-only.

@dustymabe dustymabe left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

LGTM - can we get the commit message on the one commit updated?

Comment thread mantle/util/distros.go

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

I know it feels redundant, but I really like having there at least be a sentence for the body of a commit message.

This function isn't used anywhere so we can delete it.

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

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants