From 2963206e6e8f47ab0c7bc6533eef33ae6704b2ae Mon Sep 17 00:00:00 2001 From: Claudia Beresford Date: Fri, 10 Mar 2023 16:10:01 +0000 Subject: [PATCH] test: Update network-interface config for e2es This was previously `eth0` which led to a weird and misleading error from firecracker complaining about `network_interfaces` missing.. when the api actually accepts `network-interfaces` with a dash. This is a red-herring: really firecracker just wasn't happy with us setting `eth0` because it apparently uses that for something else. I also updated the images used in the test to use our official builds. --- test/e2e/utils/utils.go | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/test/e2e/utils/utils.go b/test/e2e/utils/utils.go index 79e5c865..6f631c2a 100644 --- a/test/e2e/utils/utils.go +++ b/test/e2e/utils/utils.go @@ -79,8 +79,8 @@ func PidRunning(pid int) bool { func defaultTestMicroVM(name, namespace string) *types.MicroVMSpec { var ( - kernelImage = "docker.io/richardcase/ubuntu-bionic-kernel:0.0.11" - cloudImage = "docker.io/richardcase/ubuntu-bionic-test:cloudimage_v0.0.1" + binImage = "ghcr.io/weaveworks-liquidmetal/flintlock-kernel:5.10.77" + osImage = "ghcr.io/weaveworks-liquidmetal/capmvm-k8s-os:1.23.5" ) return &types.MicroVMSpec{ @@ -89,25 +89,20 @@ func defaultTestMicroVM(name, namespace string) *types.MicroVMSpec { Vcpu: 2, //nolint: gomnd MemoryInMb: 2048, //nolint: gomnd Kernel: &types.Kernel{ - Image: kernelImage, - Cmdline: map[string]string{}, - Filename: pointyString("vmlinux"), + Image: binImage, + Filename: pointyString("boot/vmlinux"), AddNetworkConfig: true, }, - Initrd: &types.Initrd{ - Image: kernelImage, - Filename: pointyString("initrd-generic"), - }, RootVolume: &types.Volume{ Id: "root", - IsReadOnly: true, + IsReadOnly: false, Source: &types.VolumeSource{ - ContainerSource: pointyString(cloudImage), + ContainerSource: pointyString(osImage), }, }, Interfaces: []*types.NetworkInterface{ { - DeviceId: "eth0", + DeviceId: "eth1", Type: 0, }, },