File tree Expand file tree Collapse file tree 2 files changed +10
-8
lines changed Expand file tree Collapse file tree 2 files changed +10
-8
lines changed Original file line number Diff line number Diff line change @@ -394,12 +394,6 @@ jobs:
394
394
retry_on : error
395
395
max_attempts : 3
396
396
command : ./hack/test-upgrade.sh ${{ matrix.oldver }} ${{ github.sha }}
397
- - name : " Debug: ha.stdout.log"
398
- if : always()
399
- run : cat ~/.lima/test-upgrade/ha.stdout.log || true
400
- - name : " Debug: ha.stderr.log"
401
- if : always()
402
- run : cat ~/.lima/test-upgrade/ha.stderr.log || true
403
397
404
398
vz :
405
399
name : " vz"
Original file line number Diff line number Diff line change @@ -38,6 +38,10 @@ function uninstall_lima() {
38
38
fi
39
39
}
40
40
41
+ function show_lima_log() {
42
+ tail -n 100 ~ /.lima/" ${LIMA_INSTANCE} " /* .log || true
43
+ }
44
+
41
45
INFO " Uninstalling lima"
42
46
uninstall_lima
43
47
@@ -47,8 +51,12 @@ install_lima "${OLDVER}"
47
51
export LIMA_INSTANCE=" test-upgrade"
48
52
49
53
INFO " Creating an instance \" ${LIMA_INSTANCE} \" with the old Lima"
50
- defer " limactl delete -f \" ${LIMA_INSTANCE} \" "
51
- limactl start --tty=false " ${LIMA_INSTANCE} "
54
+ defer " show_lima_log;limactl delete -f \" ${LIMA_INSTANCE} \" "
55
+ # Lima older than v0.15.1 needs `-pdpe1gb` for stability: https://github.com/lima-vm/lima/pull/1487
56
+ QEMU_SYSTEM_X86_64=" qemu-system-x86_64 -cpu host,-pdpe1gb" limactl start --tty=false " ${LIMA_INSTANCE} " || (
57
+ show_lima_log
58
+ exit 1
59
+ )
52
60
lima nerdctl info
53
61
54
62
image_name=" lima-test-upgrade-containerd-${RANDOM} "
You can’t perform that action at this time.
0 commit comments