Skip to content

Commit

Permalink
Merge pull request #2272 from metal3-io-bot/cherry-pick-2267-to-relea…
Browse files Browse the repository at this point in the history
…se-1.7

🐛 Fix live-iso serial console boot verification in e2e
  • Loading branch information
metal3-io-bot authored Jan 27, 2025
2 parents 4e5400c + d776a88 commit 1b8ab38
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion scripts/ci-e2e.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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=(
Expand Down
2 changes: 1 addition & 1 deletion test/e2e/live_iso_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit 1b8ab38

Please sign in to comment.