kola/butane/grub-users: Update the test #2731
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
jlebon
reviewed
Nov 13, 2023
tests/kola/butane/grub-users/test.sh
Outdated
| @@ -36,18 +36,18 @@ rebooted) | |||
| fatal "Rebooted into old deployment" | |||
| fi | |||
| # cross-check karg with BLS configs | |||
| if grep -q test-added-karg /boot/loader.0/entries/ostree-1-fedora-coreos.conf; then | |||
| if grep -q test-added-karg /boot/loader.0/entries/ostree-1.conf; then | |||
There was a problem hiding this comment.
We need the test to work with the old filename too. Maybe simplest is just e.g.
Suggested change
| if grep -q test-added-karg /boot/loader.0/entries/ostree-1.conf; then | |
| if grep -q test-added-karg /boot/loader.0/entries/ostree-1*.conf; then |
Adapt the test as per the changes from coreos#2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf
gursewak1997
force-pushed
the
fix-grubusers
branch
from
88328ab to
ccea516
Compare
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.
Adapt the
ext.config.butane.grub-userstest as per the changes from #2723. Now, we git grep fromostree-x.confinstead ofostress-x-fedora-coreos.conf. Keeping the test to grep againstostree-x*.confso we can still run the test with old file names.