Skip to content

Commit

Permalink
test: Update network-interface config for e2es (#664)
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
Callisto13 authored Mar 10, 2023
1 parent 1b7ca32 commit 119029a
Showing 1 changed file with 7 additions and 12 deletions.
19 changes: 7 additions & 12 deletions test/e2e/utils/utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -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{
Expand All @@ -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,
},
},
Expand Down

0 comments on commit 119029a

Please sign in to comment.