kola: check ssh to VM when running iso.* tests

Author: nikita-dubrovskii

mantle/kola/tests/iso/common.go

@@ -186,7 +186,7 @@ OnFailureJobMode=isolate
 [Service]
 Type=oneshot
 RemainAfterExit=yes
-ExecStart=/bin/sh -c '/usr/bin/echo %s >/dev/virtio-ports/testisocompletion && systemctl poweroff'
+ExecStart=/bin/sh -c '/usr/bin/echo %s >/dev/virtio-ports/testisocompletion'
 [Install]
 RequiredBy=multi-user.target`, signalCompleteString)
 

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

@@ -383,19 +383,14 @@ func isoRunTest(qc *qemu.Cluster, opts IsoTestOpts, tempdir string) error {
 		if opts.addNmKeyfile {
 			kargs = append(kargs, "rd.neednet=1")
 		}
-		builder.AppendKernelArgs = strings.Join(kargs, " ")
-		return nil
-	}
-
-	setupNet := func(o platform.QemuMachineOptions, builder *platform.QemuBuilder) error {
 		if !opts.isOffline {
 			// also save pointer config into the output dir for debugging
-			path := filepath.Join(qc.RuntimeConf().OutputDir, builder.UUID, "config-target-pointer.ign")
+			path := filepath.Join(filepath.Dir(builder.ConfigFile), "config-target-pointer.ign")
 			if err := targetConfig.WriteFile(path); err != nil {
 				return err
 			}
-			return qc.SetupDefaultNetwork(o, builder)
 		}
+		builder.AppendKernelArgs = strings.Join(kargs, " ")
 		return nil
 	}
 
@@ -433,10 +428,8 @@ func isoRunTest(qc *qemu.Cluster, opts IsoTestOpts, tempdir string) error {
 		return builder.AddIso(isopath, "bootindex=3", false)
 	}
 
-	extra := platform.QemuMachineOptions{}
-	extra.SkipStartMachine = true
-	callacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, SetupNetwork: setupNet, OverrideDefaults: overrideFW}
-	qm, err := qc.NewMachineWithQemuOptionsAndBuilderCallbacks(liveConfig, extra, callacks)
+	callacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, OverrideDefaults: overrideFW}
+	qm, err := qc.NewMachineWithQemuOptionsAndBuilderCallbacks(liveConfig, platform.QemuMachineOptions{}, callacks)
 	if err != nil {
 		return errors.Wrap(err, "unable to create test machine")
 	}

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

@@ -235,7 +235,7 @@ func testPXE(c cluster.TestCluster, opts IsoTestOpts) {
 		return nil
 	}
 
-	setupNet := func(_ platform.QemuMachineOptions, builder *platform.QemuBuilder) error {
+	setupNet := func(o platform.QemuMachineOptions, builder *platform.QemuBuilder) error {
 		netdev := fmt.Sprintf("%s,netdev=mynet0,mac=52:54:00:12:34:56", pxe.networkdevice)
 		if pxe.bootindex == "" {
 			builder.Append("-boot", "once=n")
@@ -248,7 +248,7 @@ func testPXE(c cluster.TestCluster, opts IsoTestOpts) {
 			usernetdev += ",net=192.168.76.0/24,dhcpstart=192.168.76.9"
 		}
 		builder.Append("-netdev", usernetdev)
-		return nil
+		return qc.SetupDefaultNetwork(o, builder)
 	}
 
 	var isoCompletionOutput *os.File
@@ -285,10 +285,8 @@ func testPXE(c cluster.TestCluster, opts IsoTestOpts) {
 		return nil
 	}
 
-	extra := platform.QemuMachineOptions{}
-	extra.SkipStartMachine = true
 	callacks := qemu.BuilderCallbacks{SetupDisks: setupDisks, SetupNetwork: setupNet, OverrideDefaults: overrideFW}
-	qm, err := qc.NewMachineWithQemuOptionsAndBuilderCallbacks(liveConfig, extra, callacks)
+	qm, err := qc.NewMachineWithQemuOptionsAndBuilderCallbacks(liveConfig, platform.QemuMachineOptions{}, callacks)
 	if err != nil {
 		c.Fatal(errors.Wrap(err, "unable to create test machine"))
 	}