Skip to content

Commit d7aba7a

Browse files
authored
Merge pull request #84 from nirs/ci-plain-mode
ci: More test cleanups
2 parents 5e87dff + 1905a91 commit d7aba7a

File tree

2 files changed

+8
-15
lines changed

2 files changed

+8
-15
lines changed

.github/workflows/test.yml

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -66,16 +66,9 @@ jobs:
6666
- name: Test (shared mode)
6767
run: ./test/test.sh /var/run/socket_vmnet
6868
# Bridged mode cannot be tested on GHA
69-
- uses: actions/setup-go@0a12ed9d6a96ab950c8f026ed9f722fe0da7ef32 # v5.0.2
70-
with:
71-
go-version: 1.23.x
7269
- name: Install Lima
7370
run: |
74-
git clone https://github.com/lima-vm/lima
75-
cd lima
76-
git checkout v0.23.2
77-
make
78-
sudo make install
71+
brew install lima
7972
limactl sudoers >etc_sudoers.d_lima
8073
sudo install -o root etc_sudoers.d_lima "/private/etc/sudoers.d/lima"
8174
- name: Install the dependencies for the Lima integration test
@@ -86,7 +79,9 @@ jobs:
8679
limactl shell vm1 ip a
8780
- name: "Lima: vm1: set up iperf3"
8881
run: |
89-
limactl shell vm1 sudo DEBIAN_FRONTEND=noninteractive apt-get install -y iperf3
82+
export DEBIAN_FRONTEND=noninteractive
83+
limactl shell vm1 sudo apt-get update
84+
limactl shell vm1 sudo apt-get install -y iperf3
9085
limactl shell vm1 sudo systemctl start iperf3.service
9186
- name: "Lima: vm1: get the IP"
9287
run: |
@@ -103,7 +98,9 @@ jobs:
10398
limactl shell vm2 ip a
10499
- name: "Lima: vm2: set up iperf3"
105100
run: |
106-
limactl shell vm2 sudo DEBIAN_FRONTEND=noninteractive apt-get install -y iperf3
101+
export DEBIAN_FRONTEND=noninteractive
102+
limactl shell vm2 sudo apt-get update
103+
limactl shell vm2 sudo apt-get install -y iperf3
107104
- name: "Lima: vm2: iperf3 (vm2 -> vm1)"
108105
run: |
109106
limactl shell vm2 iperf3 -c "$(cat /tmp/vm1_ip)"

test/vmnet.yaml

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,7 @@ images:
1313
initrd:
1414
location: https://cloud-images.ubuntu.com/releases/24.04/release-20240821/unpacked/ubuntu-24.04-server-cloudimg-amd64-initrd-generic
1515
digest: sha256:c44215c42d97abd9ada4a961de0ab7305d74c39860776cf2d7a0260ac9d0637e
16-
17-
mounts:
18-
- location: "~"
19-
- location: "/tmp/lima"
20-
writable: true
16+
plain: true
2117
memory: "1g"
2218
cpus: 1
2319
networks:

0 commit comments

Comments
 (0)