tests/kola: adapt for new pure-RHEL variants #3032
Merged
Conversation
This file contains 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
It's dead code.
A big part of the new variants added in openshift/os#1445 is that we only minimally modify `/etc/os-release`. This means that e.g. `ID` is still `rhel` and `VERSION_ID` is e.g. `9.4` for the `rhel-9.4` variant. We do still inject `VARIANT` and `VARIANT_ID` though. Adapt these library functions here to handle this.
marmijo
approved these changes
Jun 18, 2024
| @@ -160,7 +160,7 @@ if [ "$ID" == "fedora" ]; then | |||
| else | |||
| fatal "fail: not operating on expected OS version" | |||
| fi | |||
| elif [[ "${ID_LIKE}" =~ "rhel" ]]; then | |||
| elif [[ "${ID}" = "rhel" ]] || [[ "${ID_LIKE}" =~ "rhel" ]]; then | |||
There was a problem hiding this comment.
Looks like we've mostly used == for comparisons like these. I'm fine leaving it as is though because it's identical behavior in bash.
There was a problem hiding this comment.
Yeah, it's kind of a mess. Would've been nice if bash only supported one kind. I don't think we have any consistency overall in this codebase one way or the other.
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.
A big part of the new variants added in
openshift/os#1445 is that we only minimally
modify
/etc/os-release. This means that e.g.IDis stillrhelandVERSION_IDis e.g.9.4for therhel-9.4variant. We do stillinject
VARIANTandVARIANT_IDthough.Adapt these library functions here to handle this.