Skip to content

Commit 4f72e40

Browse files
committed
CI: move 9p and test-misc from macOS to Linux; remove deprecated vde
QEMU is getting too flaky on macOS on GHA (issue 84), possible due to nested virtualization Signed-off-by: Akihiro Suda <[email protected]>
1 parent 377d685 commit 4f72e40

File tree

1 file changed

+3
-39
lines changed

1 file changed

+3
-39
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -191,21 +191,7 @@ jobs:
191191
retry_on: error
192192
max_attempts: 3
193193
command: ./hack/test-templates.sh templates/default.yaml
194-
- name: "Test experimental/9p.yaml"
195-
uses: nick-invision/retry@v3
196-
with:
197-
timeout_minutes: 30
198-
retry_on: error
199-
max_attempts: 3
200-
command: ./hack/test-templates.sh templates/experimental/9p.yaml
201-
- name: "Test test-misc.yaml"
202-
uses: nick-invision/retry@v3
203-
with:
204-
timeout_minutes: 30
205-
retry_on: error
206-
max_attempts: 3
207-
command: ./hack/test-templates.sh hack/test-templates/test-misc.yaml
208-
# GHA macOS is slow and flaky, so we only test a few YAMLS here.
194+
# GHA macOS is slow and flaky, so we only test default.yaml here.
209195
# Other yamls are tested on Linux instances.
210196
#
211197
- name: "Show cache"
@@ -228,8 +214,10 @@ jobs:
228214
- archlinux.yaml
229215
- opensuse.yaml
230216
- experimental/net-user-v2.yaml
217+
- experimental/9p.yaml
231218
- docker.yaml
232219
- ../hack/test-templates/alpine-9p-writable.yaml
220+
- ../hack/test-templates/test-misc.yaml
233221
steps:
234222
- uses: actions/checkout@v4
235223
with:
@@ -339,30 +327,6 @@ jobs:
339327
run: make install
340328
- name: Install test dependencies
341329
run: brew install qemu bash coreutils iperf3
342-
- name: Install vde_switch and vde_vmnet (Deprecated)
343-
env:
344-
VDE_VMNET_VERSION: v0.6.0
345-
run: |
346-
(
347-
brew install autoconf automake
348-
cd ~
349-
git clone https://github.com/lima-vm/vde_vmnet
350-
cd vde_vmnet
351-
git checkout $VDE_VMNET_VERSION
352-
sudo git config --global --add safe.directory /Users/runner/vde_vmnet
353-
sudo make PREFIX=/opt/vde install
354-
)
355-
limactl sudoers | sudo tee /etc/sudoers.d/lima
356-
- name: Unit test (pkg/networks) with vde_vmnet (Deprecated)
357-
# Set -count=1 to disable cache
358-
run: go test -v -count=1 ./pkg/networks/...
359-
- name: Test vde_vmnet (Deprecated)
360-
uses: nick-invision/retry@v3
361-
with:
362-
timeout_minutes: 30
363-
retry_on: error
364-
max_attempts: 3
365-
command: ./hack/test-templates.sh templates/vmnet.yaml
366330
- name: Install socket_vmnet
367331
env:
368332
SOCKET_VMNET_VERSION: v1.1.1

0 commit comments

Comments
 (0)