mantle/kola: add InstanceType to PlatformOptions for external tests

Add an `InstanceType` field  to `PlatformOptions` to allow external
tests to override the instance type used in `kola run`. This is useful
for cases where a specific test needs to run on a different (potentially
more expensive) instance type. Support for this is currently limited
to the Azure Platform.

Also, fix the `MultiPathDisk` check for the qemu-iso platform. The check
is now correctly performed in the `NewMachineWithOptions` function, since
`MultiPathDisk` is part of `platform.MachineOptions`.

Author: marmijo

mantle/kola/harness.go

@@ -1027,6 +1027,7 @@ type externalTestMeta struct {
 	Conflicts                 []string `json:"conflicts"                           yaml:"conflicts"`
 	AllowConfigWarnings       bool     `json:"allowConfigWarnings"                 yaml:"allowConfigWarnings"`
 	NoInstanceCreds           bool     `json:"noInstanceCreds"                     yaml:"noInstanceCreds"`
+	InstanceType              string   `json:"instanceType"                        yaml:"instanceType"`
 	Description               string   `json:"description"                         yaml:"description"`
 }
 
@@ -1236,6 +1237,7 @@ ExecStart=%s
 		AdditionalNics:            targetMeta.AdditionalNics,
 		AppendKernelArgs:          targetMeta.AppendKernelArgs,
 		AppendFirstbootKernelArgs: targetMeta.AppendFirstbootKernelArgs,
+		InstanceType:              targetMeta.InstanceType,
 		NonExclusive:              !targetMeta.Exclusive,
 		Conflicts:                 targetMeta.Conflicts,
 
@@ -1757,6 +1759,7 @@ func runTest(h *harness.H, t *register.Test, pltfrm string, flight platform.Flig
 			AppendKernelArgs:          t.AppendKernelArgs,
 			AppendFirstbootKernelArgs: t.AppendFirstbootKernelArgs,
 			SkipStartMachine:          true,
+			InstanceType:              t.InstanceType,
 		}
 
 		// Providers sometimes fail to bring up a machine within a

mantle/kola/register/register.go

@@ -117,6 +117,10 @@ type Test struct {
 	// Conflicts is non-empty iff nonexclusive is true
 	// Contains the tests that conflict with this particular test
 	Conflicts []string
+
+	// If provided, this test will be run on the target instance type.
+	// This overrides the instance type set with `kola run`
+	InstanceType string
 }
 
 // Registered tests that run as part of `kola run` live here. Mapping of names

mantle/platform/api/azure/instance.go

@@ -51,7 +51,7 @@ func (a *API) getInstance(name, resourceGroup string) (armcompute.VirtualMachine
 	return resp.VirtualMachine, nil
 }
 
-func (a *API) getVMParameters(name, userdata, sshkey, storageAccountURI string, ip armnetwork.PublicIPAddress, nic armnetwork.Interface) armcompute.VirtualMachine {
+func (a *API) getVMParameters(name, userdata, sshkey, storageAccountURI, size string, ip armnetwork.PublicIPAddress, nic armnetwork.Interface) armcompute.VirtualMachine {
 
 	// Azure requires that either a username/password be set or an SSH key.
 	//
@@ -125,7 +125,7 @@ func (a *API) getVMParameters(name, userdata, sshkey, storageAccountURI string,
 		},
 		Properties: &armcompute.VirtualMachineProperties{
 			HardwareProfile: &armcompute.HardwareProfile{
-				VMSize: to.Ptr(armcompute.VirtualMachineSizeTypes(a.opts.Size)),
+				VMSize: to.Ptr(armcompute.VirtualMachineSizeTypes(size)),
 			},
 			StorageProfile: &armcompute.StorageProfile{
 				ImageReference: imgRef,
@@ -181,7 +181,14 @@ func (a *API) CreateInstance(name, userdata, sshkey, resourceGroup, storageAccou
 		return nil, fmt.Errorf("couldn't get NIC name")
 	}
 
-	vmParams := a.getVMParameters(name, userdata, sshkey, fmt.Sprintf("https://%s.blob.core.windows.net/", storageAccount), ip, nic)
+	var size string
+	if opts.InstanceType != "" {
+		size = opts.InstanceType
+	} else {
+		size = a.opts.Size
+	}
+
+	vmParams := a.getVMParameters(name, userdata, sshkey, fmt.Sprintf("https://%s.blob.core.windows.net/", storageAccount), size, ip, nic)
 
 	ctx, cancel := context.WithTimeout(context.Background(), 10*time.Minute)
 	defer cancel()

mantle/platform/machine/aws/cluster.go

@@ -57,6 +57,10 @@ func (ac *cluster) NewMachineWithOptions(userdata *conf.UserData, options platfo
 		return nil, errors.New("platform aws does not support appending firstboot kernel arguments")
 	}
 
+	if options.InstanceType != "" {
+		return nil, errors.New("platform aws does not support changing instance types")
+	}
+
 	conf, err := ac.RenderUserData(userdata, map[string]string{
 		"$public_ipv4":  "${COREOS_EC2_IPV4_PUBLIC}",
 		"$private_ipv4": "${COREOS_EC2_IPV4_LOCAL}",

mantle/platform/machine/do/cluster.go

@@ -52,6 +52,9 @@ func (dc *cluster) NewMachineWithOptions(userdata *conf.UserData, options platfo
 	if options.AppendFirstbootKernelArgs != "" {
 		return nil, errors.New("platform do does not support appending firstboot kernel arguments")
 	}
+	if options.InstanceType != "" {
+		return nil, errors.New("platform do does not support changing instance types")
+	}
 
 	conf, err := dc.RenderUserData(userdata, map[string]string{
 		"$public_ipv4":  "${COREOS_DIGITALOCEAN_IPV4_PUBLIC_0}",

mantle/platform/machine/esx/cluster.go

@@ -58,6 +58,9 @@ func (ec *cluster) NewMachineWithOptions(userdata *platformConf.UserData, option
 	if options.AppendFirstbootKernelArgs != "" {
 		return nil, errors.New("platform esx does not support appending firstboot kernel arguments")
 	}
+	if options.InstanceType != "" {
+		return nil, errors.New("platform esx does not support changing instance types")
+	}
 
 	conf, err := ec.RenderUserData(userdata, map[string]string{
 		"$public_ipv4":  "${COREOS_ESX_IPV4_PUBLIC_0}",

mantle/platform/machine/gcloud/cluster.go

@@ -49,6 +49,9 @@ func (gc *cluster) NewMachineWithOptions(userdata *conf.UserData, options platfo
 	if options.AppendFirstbootKernelArgs != "" {
 		return nil, errors.New("platform gcp does not support appending firstboot kernel arguments")
 	}
+	if options.InstanceType != "" {
+		return nil, errors.New("platform gcp does not support changing instance types")
+	}
 
 	conf, err := gc.RenderUserData(userdata, map[string]string{
 		"$public_ipv4":  "${COREOS_GCE_IP_EXTERNAL_0}",

mantle/platform/machine/openstack/cluster.go

@@ -50,6 +50,9 @@ func (oc *cluster) NewMachineWithOptions(userdata *conf.UserData, options platfo
 	if options.AppendFirstbootKernelArgs != "" {
 		return nil, errors.New("platform openstack does not support appending firstboot kernel arguments")
 	}
+	if options.InstanceType != "" {
+		return nil, errors.New("platform openstack does not support changing instance types")
+	}
 
 	conf, err := oc.RenderUserData(userdata, map[string]string{
 		"$public_ipv4":  "${COREOS_OPENSTACK_IPV4_PUBLIC}",

mantle/platform/machine/qemu/cluster.go

@@ -49,6 +49,9 @@ func (qc *Cluster) NewMachine(userdata *conf.UserData) (platform.Machine, error)
 }
 
 func (qc *Cluster) NewMachineWithOptions(userdata *conf.UserData, options platform.MachineOptions) (platform.Machine, error) {
+	if options.InstanceType != "" {
+		return nil, errors.New("platform qemu does not support changing instance types")
+	}
 	return qc.NewMachineWithQemuOptions(userdata, platform.QemuMachineOptions{
 		MachineOptions: options,
 	})

mantle/platform/machine/qemuiso/cluster.go

@@ -47,15 +47,18 @@ func (qc *Cluster) NewMachine(userdata *conf.UserData) (platform.Machine, error)
 }
 
 func (qc *Cluster) NewMachineWithOptions(userdata *conf.UserData, options platform.MachineOptions) (platform.Machine, error) {
+	if options.InstanceType != "" {
+		return nil, errors.New("platform qemu-iso does not support changing instance types")
+	}
+	if options.MultiPathDisk {
+		return nil, errors.New("platform qemu-iso does not support multipathed primary disks")
+	}
 	return qc.NewMachineWithQemuOptions(userdata, platform.QemuMachineOptions{
 		MachineOptions: options,
 	})
 }
 
 func (qc *Cluster) NewMachineWithQemuOptions(userdata *conf.UserData, options platform.QemuMachineOptions) (platform.Machine, error) {
-	if options.MultiPathDisk {
-		return nil, errors.New("platform qemu-iso does not support multipathed primary disks")
-	}
 	id := uuid.New()
 
 	dir := filepath.Join(qc.RuntimeConf().OutputDir, id)

mantle/platform/platform.go

@@ -163,6 +163,7 @@ type MachineOptions struct {
 	AppendKernelArgs          string
 	AppendFirstbootKernelArgs string
 	SkipStartMachine          bool // Skip platform.StartMachine on machine bringup
+	InstanceType              string
 }
 
 // SystemdDropin is a userdata type agnostic struct representing a systemd dropin