Skip to content

Commit 49142c5

Browse files
committed
ci: switch to ubuntu runner for freebsd job
Signed-off-by: CrazyMax <[email protected]>
1 parent 1da789b commit 49142c5

File tree

2 files changed

+10
-20
lines changed

2 files changed

+10
-20
lines changed

.github/workflows/test-os.yml

Lines changed: 9 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -174,11 +174,10 @@ jobs:
174174
uses: crazy-max/ghaction-dump-context@v2
175175

176176
test-freebsd-amd64:
177-
runs-on: macos-13
177+
runs-on: ubuntu-22.04
178178
needs:
179179
- build
180180
env:
181-
VAGRANT_VAGRANTFILE: hack/Vagrantfile.freebsd13
182181
GOOS: freebsd
183182
steps:
184183
-
@@ -195,25 +194,23 @@ jobs:
195194
uses: actions/cache@v4
196195
with:
197196
path: ~/.vagrant.d/boxes
198-
key: ${{ runner.os }}-vagrant-${{ hashFiles('hack/Vagrantfile.freebsd13') }}
197+
key: ${{ runner.os }}-vagrant-${{ hashFiles('hack/Vagrantfile.freebsd') }}
199198
restore-keys: |
200199
${{ runner.os }}-vagrant-
201200
-
202-
name: Install vagrant and VirtualBox
203-
run: |
204-
set -x
205-
brew tap hashicorp/tap
206-
brew install hashicorp/tap/hashicorp-vagrant
207-
brew install --cask virtualbox
208-
-
209-
name: Check versions
201+
name: Install vagrant
210202
run: |
211203
set -x
204+
sudo apt-get update
205+
sudo apt-get install -y libvirt-daemon libvirt-daemon-system vagrant vagrant-libvirt ruby-libvirt
206+
sudo systemctl enable --now libvirtd
207+
sudo chmod a+rw /var/run/libvirt/libvirt-sock
208+
vagrant plugin install vagrant-libvirt
212209
vagrant --version
213-
VBoxManage -v
214210
-
215211
name: Set up vagrant
216212
run: |
213+
ln -sf hack/Vagrantfile.freebsd Vagrantfile
217214
vagrant up --no-tty
218215
-
219216
name: Smoke test
@@ -233,7 +230,3 @@ jobs:
233230
if: always()
234231
run: |
235232
vagrant ssh -- "sudo cat /vagrant/.tmp/logs/containerd"
236-
-
237-
name: Dump context
238-
if: failure()
239-
uses: crazy-max/ghaction-dump-context@v2

hack/Vagrantfile.freebsd13 renamed to hack/Vagrantfile.freebsd

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,7 @@
22
# vi: set ft=ruby :
33

44
Vagrant.configure("2") do |config|
5-
config.vm.define "fbsd_13_2" do |fbsd_13_2|
6-
fbsd_13_2.vm.box = "freebsd/FreeBSD-13.2-RELEASE"
7-
end
8-
5+
config.vm.box = "generic/freebsd14"
96
config.vm.boot_timeout = 900
107
config.vm.synced_folder ".", "/vagrant", type: "rsync"
118
config.ssh.keep_alive = true

0 commit comments

Comments
 (0)