tests: fix boot.bootupd-validate on rhel-9.6 #3297
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
In the el-only variants, there is no `RHEL_VERSION` since the RHEL version _is_ `VERSION_ID`. Add a new `get_rhel_ver` commonlib function to abstract this away and use that in the test. Don't bother checking for the `VARIANT_ID`. We only care about the coreos variant in the tests in this repo. (And once we start moving tests to fedora-bootc, we would want to remove these checks anyway.)
dustymabe
reviewed
Dec 4, 2024
| @@ -84,7 +84,7 @@ validate() { | |||
| # should remove this until https://issues.redhat.com/browse/RHEL-66584 is fixed | |||
| set_selinux_permissve() { | |||
| source /etc/os-release | |||
| if is_scos || ([ "${RHEL_VERSION}" == "9.6" ] && [ "${VARIANT_ID}" == "coreos" ] ); then | |||
| if is_scos || [ "$(get_rhel_ver)" = "9.6" ]; then | |||
There was a problem hiding this comment.
Suggested change
| if is_scos || [ "$(get_rhel_ver)" = "9.6" ]; then | |
| if is_scos || [ "$(get_rhel_ver)" == "9.6" ]; then |
I tend to prefer the == variant.
dustymabe
approved these changes
Dec 4, 2024
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.
In the el-only variants, there is no
RHEL_VERSIONsince the RHEL version isVERSION_ID.Add a new
get_rhel_vercommonlib function to abstract this away and use that in the test.Don't bother checking for the
VARIANT_ID. We only care about the coreos variant in the tests in this repo. (And once we start moving tests to fedora-bootc, we would want to remove these checks anyway.)