Skip to content

Commit dedadbf

Browse files
committed
CI: add vz
Signed-off-by: Akihiro Suda <[email protected]>
1 parent 01dbd4d commit dedadbf

File tree

3 files changed

+35
-2
lines changed

3 files changed

+35
-2
lines changed

.github/workflows/test.yml

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,3 +229,28 @@ jobs:
229229
retry_on: error
230230
max_attempts: 3
231231
command: ./hack/test-upgrade.sh ${{ matrix.oldver }} ${{ github.sha }}
232+
233+
vz:
234+
name: "vz"
235+
runs-on: macos-13
236+
timeout-minutes: 120
237+
steps:
238+
- uses: actions/setup-go@v4
239+
with:
240+
go-version: 1.20.x
241+
- uses: actions/checkout@v3
242+
with:
243+
fetch-depth: 1
244+
- name: Make
245+
run: make
246+
- name: Install
247+
run: make install
248+
- name: Install test dependencies
249+
run: brew install qemu bash coreutils
250+
- name: Cache ~/Library/Caches/lima/download
251+
uses: actions/cache@v3
252+
with:
253+
path: ~/Library/Caches/lima/download
254+
key: ${{ runner.os }}-vz
255+
- name: Test
256+
run: ./hack/test-example.sh examples/experimental/vz.yaml

hack/test-example.sh

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,12 @@ case "$NAME" in
6060
CHECKS["snapshot-online"]=""
6161
CHECKS["user-v2"]=1
6262
;;
63+
"vz")
64+
CHECKS["systemd-strict"]=
65+
CHECKS["port-forwards"]=""
66+
CHECKS["snapshot-online"]=""
67+
CHECKS["snapshot-offline"]=""
68+
;;
6369
esac
6470

6571
if limactl ls -q | grep -q "$NAME"; then
@@ -83,8 +89,8 @@ function diagnose() {
8389
NAME="$1"
8490
set -x +e
8591
tail "$HOME/.lima/${NAME}"/*.log
86-
limactl shell "$NAME" systemctl status
87-
limactl shell "$NAME" systemctl
92+
limactl shell "$NAME" systemctl --no-pager status
93+
limactl shell "$NAME" systemctl --no-pager
8894
limactl shell "$NAME" sudo cat /var/log/cloud-init-output.log
8995
set +x -e
9096
}

pkg/cidata/cidata.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,8 @@ func GenerateISO9660(instDir, name string, y *limayaml.LimaYAML, udpDNSLocalPort
126126
SlirpGateway: networks.SlirpGateway,
127127
SlirpDNS: networks.SlirpDNS,
128128
SlirpIPAddress: networks.SlirpIPAddress,
129+
}
130+
if runtime.GOOS == "darwin" && runtime.GOARCH == "arm64" {
129131
RosettaEnabled: *y.Rosetta.Enabled,
130132
RosettaBinFmt: *y.Rosetta.BinFmt,
131133
}

0 commit comments

Comments
 (0)