[rhcos-4.15] tests/var-mount/scsi-id: simplify bootloader entry finding #2962
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
We don't have to be super strict here in how we find the bootloader entry. There should only be one, so simplify the logic using a glob instead. Motivated by the fact that this will break otherwise as part of openshift/os#1445 where the `ID` will be `centos`, but the stateroot will still be `scos`. (cherry picked from commit 476a371) --- We're backporting this because a recent rebuild of 4.15 cosa pulled in a new ostree which enables `bootloader-naming-2` by default, which changes the BLS entry name: ostreedev/ostree#3206
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.
We don't have to be super strict here in how we find the bootloader entry. There should only be one, so simplify the logic using a glob instead.
Motivated by the fact that this will break otherwise as part of openshift/os#1445 where the
IDwill becentos, but the stateroot will still bescos.(cherry picked from commit 476a371)
We're backporting this because a recent rebuild of 4.15 cosa pulled in a new ostree which enables
bootloader-naming-2by default, which changes the BLS entry name:ostreedev/ostree#3206