From 88328abf4e33c8c473ba738777219ba4418cc4d4 Mon Sep 17 00:00:00 2001 From: gursewak1997 Date: Mon, 13 Nov 2023 11:30:58 -0800 Subject: [PATCH] kola/butane/grub-users: Update the test Adapt the test as per the changes from https://github.com/coreos/fedora-coreos-config/pull/2723 Now, we git grep from ostree-x.conf instead of ostress-x-fedora-coreos.conf --- tests/kola/butane/grub-users/test.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/kola/butane/grub-users/test.sh b/tests/kola/butane/grub-users/test.sh index beb28f8de4..b5e5e1f1f4 100755 --- a/tests/kola/butane/grub-users/test.sh +++ b/tests/kola/butane/grub-users/test.sh @@ -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 fatal "Old BLS config contains new karg" fi - if ! grep -q test-added-karg /boot/loader.0/entries/ostree-2-fedora-coreos.conf; then + if ! grep -q test-added-karg /boot/loader.0/entries/ostree-2.conf; then fatal "New BLS config doesn't contain new karg" fi # old deployment should require a password to boot - if ! grep -q '^grub_users ""$' /boot/loader.0/entries/ostree-1-fedora-coreos.conf; then + if ! grep -q '^grub_users ""$' /boot/loader.0/entries/ostree-1.conf; then fatal "Missing grub_users setting in old BLS config" fi # new one should not - if grep -q grub_users /boot/loader.0/entries/ostree-2-fedora-coreos.conf; then + if grep -q grub_users /boot/loader.0/entries/ostree-2.conf; then fatal "grub_users setting present in new BLS config" fi ok "BLS grub_users setting"