From d776a88c0f49f76cd252b2f5167bbb4f189a59f6 Mon Sep 17 00:00:00 2001 From: Adam Rozman Date: Thu, 23 Jan 2025 14:17:11 +0200 Subject: [PATCH] fix live-iso serial console boot verification This commit: - Changes the target string looked for via the serial logs by the ginkgo live-iso test code to verify that the live iso image has been booted properly. - Removes the redundant use of the "cat" command from the boot verification process in the live-iso test - Changes the name of the live-iso test image to the new image that is uefi compatible. This change is needed because the release1.8 e2e feature test are failing the live-iso boot verification even when the live-iso boot menu is visible in the serial logs. Signed-off-by: Adam Rozman --- scripts/ci-e2e.sh | 2 +- test/e2e/live_iso_test.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/ci-e2e.sh b/scripts/ci-e2e.sh index d192ef0f39..4ed2f6c9a0 100755 --- a/scripts/ci-e2e.sh +++ b/scripts/ci-e2e.sh @@ -118,7 +118,7 @@ esac export CONTRACT_TO="v1beta1" # image for live iso testing -export LIVE_ISO_IMAGE="https://artifactory.nordix.org/artifactory/metal3/images/iso/minimal_linux_live-v2.iso" +export LIVE_ISO_IMAGE="https://artifactory.nordix.org/artifactory/metal3/images/iso/minimal_linux_live-v3-uefi.iso" # Generate credentials BMO_OVERLAYS=( diff --git a/test/e2e/live_iso_test.go b/test/e2e/live_iso_test.go index 448d30fd7d..4a9b9f9672 100644 --- a/test/e2e/live_iso_test.go +++ b/test/e2e/live_iso_test.go @@ -92,7 +92,7 @@ func liveIsoTest() { By("Reading serial logs to verify the node was booted from live ISO image") Eventually(func(g Gomega) { - cmd := fmt.Sprintf("sudo cat %s | grep '# Welcome'", serialLogFile) + cmd := fmt.Sprintf("sudo grep 'Minimal Linux Live' '%s'", serialLogFile) output, err := exec.Command("/bin/sh", "-c", cmd).Output() g.Expect(err).ToNot(HaveOccurred()) g.Expect(output).ToNot(BeNil(), fmt.Sprintf("Failed to read serial logs from %s", serialLogFile))