kola: small fixes for iso.* tests

Author: nikita-dubrovskii

mantle/kola/tests/iso/common.go

@@ -129,7 +129,7 @@ func forwardJournal(outdir string, builder *platform.QemuBuilder, config *conf.C
 	go func() {
 		_, err := io.Copy(journalOut, journalPipe)
 		if err != nil && err != io.EOF {
-			panic(err)
+			fmt.Printf("error copying journal: %v\n", err)
 		}
 	}()
 

mantle/kola/tests/iso/live-iscsi.go

@@ -2,6 +2,7 @@ package iso
 
 import (
 	_ "embed"
+	"fmt"
 	"io"
 	"os"
 	"path/filepath"
@@ -143,15 +144,15 @@ func isoInstalliScsi(c cluster.TestCluster, opts IsoTestOpts) {
 			return err
 		}
 		// Create a file to write the contents of the serial channel into
-		path := strings.Replace(builder.ConsoleFile, "/console.txt", "/nested_vm_console.txt", 1)
+		path := filepath.Join(filepath.Dir(builder.ConsoleFile), "nested_vm_console.txt")
 		nestedVMConsole, err := os.OpenFile(path, os.O_WRONLY|os.O_CREATE, 0644)
 		if err != nil {
 			return err
 		}
 		go func() {
 			_, err := io.Copy(nestedVMConsole, nestedVmLogsChannel)
 			if err != nil && err != io.EOF {
-				panic(err)
+				fmt.Printf("error copying nested VM logs: %v\n", err)
 			}
 		}()
 

mantle/platform/machine/qemu/metal.go

@@ -35,12 +35,7 @@ import (
 	"github.com/coreos/coreos-assembler/mantle/util"
 )
 
-const (
-	// defaultQemuHostIPv4 is documented in `man qemu-kvm`, under the `-netdev` option
-	defaultQemuHostIPv4 = "10.0.2.2"
-
-	bootStartedSignal = "boot-started-OK"
-)
+const bootStartedSignal = "boot-started-OK"
 
 // TODO derive this from docs, or perhaps include kargs in cosa metadata?
 var baseKargs = []string{"rd.neednet=1", "ip=dhcp", "ignition.firstboot", "ignition.platform.id=metal"}