kola: separate SCOS and RHCOS distros #4334
Open
Conversation
This file contains hidden or 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
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request correctly restricts the luks.cex test to run only on the RHCOS distribution, which aligns with the stated goal. The change is simple and effective. The removal of a blank line in mantle/kola/tests/ignition/qemufailure.go is a minor, harmless stylistic cleanup.
nikita-dubrovskii
force-pushed
the
cex_rhcos_only
branch
from
1704772 to
7c7e030
Compare
|
Looks like this change doesn't prevent running on |
Yeah , right now kola makes scos == rhcos. coreos-assembler/mantle/cmd/kola/options.go Lines 371 to 377 in e2f878d Maybe it's time to change that ? |
jbtrystram
added a commit
to jbtrystram/rhel-coreos-config
that referenced
this pull request
Sep 29, 2025
This test requires some magic that only exists on RHCOS s390x builders. Let's denylist these tests to unblock the pipeline until we fix cosa to know to ignore centos for this. Tracking issue coreos#76 See coreos/coreos-assembler#4334
nikita-dubrovskii
force-pushed
the
cex_rhcos_only
branch
from
7c7e030 to
a986e45
Compare
nikita-dubrovskii
changed the title
mantle/util/distros.go
Outdated
|
|
||
| // TargetDistroFromName returns the distribution given | ||
| // the path to an artifact (usually a disk image). | ||
| func TargetDistroFromName(artifact string) string { |
There was a problem hiding this comment.
This function looks unused, maybe drop it?
Despite SCOS and RHCOS being largely similar, certain features (such as s390x Secure Execution and LUKS-CEX) are only supported on RHCOS. It does not make sense to run RHCOS-only tests on SCOS.
Test requires some magic https://github.com/coreos/fedora-coreos-pipeline/blob/main/multi-arch-builders/coreos-s390x-rhcos-builder.bu#L107, which only exists on RHCOS builders.
nikita-dubrovskii
force-pushed
the
cex_rhcos_only
branch
from
a986e45 to
ba70ffc
Compare
|
related to this: #4338 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Despite SCOS and RHCOS being largely similar, certain features (such as s390x Secure Execution and LUKS-CEX) are only supported on RHCOS.
It does not make sense to run RHCOS-only tests on SCOS, as they may fail, specially on s390x, where some magic is required.