diff options
| author | Claus Lensbøl <claus@tailscale.com> | 2025-12-05 09:08:26 -0500 |
|---|---|---|
| committer | Claus Lensbøl <claus@tailscale.com> | 2025-12-05 09:08:26 -0500 |
| commit | 38a7452d3d455f5641b229634552c81f359158ba (patch) | |
| tree | 16d73dee07f9b1f14a421e2cbf0cc2f7e76f2d91 | |
| parent | cf40cf5ccb1be1ab931b427f7f83bba3214ace79 (diff) | |
| download | tailscale-cmol/natlab-experiments.tar.xz tailscale-cmol/natlab-experiments.zip | |
WIP: improve reliability of natlabcmol/natlab-experiments
Signed-off-by: Claus Lensbøl <claus@tailscale.com>
| -rw-r--r-- | gokrazy/natlabapp/config.json | 3 | ||||
| -rw-r--r-- | tstest/integration/nat/nat_test.go | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/gokrazy/natlabapp/config.json b/gokrazy/natlabapp/config.json index 1968b2aac..4803f75a0 100644 --- a/gokrazy/natlabapp/config.json +++ b/gokrazy/natlabapp/config.json @@ -17,6 +17,9 @@ "tailscale.com/cmd/tailscale": { "ExtraFilePaths": { "/usr": "usr-dir" + }, + "ExtraFileContents": { + "/etc/sysctl.d/99-ipv6-dad.conf": "net.ipv6.conf.all.accept_dad = 0\nnet.ipv6.conf.default.accept_dad = 0" } } }, diff --git a/tstest/integration/nat/nat_test.go b/tstest/integration/nat/nat_test.go index 15f126985..6bce06abc 100644 --- a/tstest/integration/nat/nat_test.go +++ b/tstest/integration/nat/nat_test.go @@ -334,10 +334,10 @@ func (nt *natTest) runTest(addNode ...addNodeFunc) pingRoute { cmd := exec.Command("qemu-system-x86_64", "-M", "microvm,isa-serial=off", - "-m", "384M", - "-nodefaults", "-no-user-config", "-nographic", + "-m", "1024M", + "-nodefaults", "-no-user-config", "-nographic", "-enable-kvm", "-kernel", nt.kernel, - "-append", "console=hvc0 root=PARTUUID=60c24cc1-f3f9-427a-8199-76baa2d60001/PARTNROFF=1 ro init=/gokrazy/init panic=10 oops=panic pci=off nousb tsc=unstable clocksource=hpet gokrazy.remote_syslog.target="+sysLogAddr+" tailscale-tta=1"+envStr, + "-append", "console=hvc0 root=PARTUUID=60c24cc1-f3f9-427a-8199-76baa2d60001/PARTNROFF=1 ro init=/gokrazy/init panic=10 oops=panic pci=off nousb tsc=unstable clocksource=kvm-clock gokrazy.remote_syslog.target="+sysLogAddr+" tailscale-tta=1"+envStr, "-drive", "id=blk0,file="+disk+",format=qcow2", "-device", "virtio-blk-device,drive=blk0", "-netdev", "stream,id=net0,addr.type=unix,addr.path="+sockAddr, @@ -347,6 +347,7 @@ func (nt *natTest) runTest(addNode ...addNodeFunc) pingRoute { "-chardev", "stdio,id=virtiocon0,mux=on", "-device", "virtconsole,chardev=virtiocon0", "-mon", "chardev=virtiocon0,mode=readline", + "-cpu", "host", ) cmd.Stdout = os.Stdout cmd.Stderr = os.Stderr |