From 49142c5fdffd38c9da5e548e8f7e28dac322a838 Mon Sep 17 00:00:00 2001
From: CrazyMax <1951866+crazy-max@users.noreply.github.com>
Date: Tue, 24 Sep 2024 10:35:24 +0200
Subject: [PATCH] ci: switch to ubuntu runner for freebsd job

Signed-off-by: CrazyMax <1951866+crazy-max@users.noreply.github.com>
---
 .github/workflows/test-os.yml                 | 25 +++++++------------
 ...rantfile.freebsd13 => Vagrantfile.freebsd} |  5 +---
 2 files changed, 10 insertions(+), 20 deletions(-)
 rename hack/{Vagrantfile.freebsd13 => Vagrantfile.freebsd} (95%)

diff --git a/.github/workflows/test-os.yml b/.github/workflows/test-os.yml
index d60a90a072e3..691e7f948751 100644
--- a/.github/workflows/test-os.yml
+++ b/.github/workflows/test-os.yml
@@ -174,11 +174,10 @@ jobs:
         uses: crazy-max/ghaction-dump-context@v2
 
   test-freebsd-amd64:
-    runs-on: macos-13
+    runs-on: ubuntu-22.04
     needs:
       - build
     env:
-      VAGRANT_VAGRANTFILE: hack/Vagrantfile.freebsd13
       GOOS: freebsd
     steps:
       -
@@ -195,25 +194,23 @@ jobs:
         uses: actions/cache@v4
         with:
           path: ~/.vagrant.d/boxes
-          key: ${{ runner.os }}-vagrant-${{ hashFiles('hack/Vagrantfile.freebsd13') }}
+          key: ${{ runner.os }}-vagrant-${{ hashFiles('hack/Vagrantfile.freebsd') }}
           restore-keys: |
             ${{ runner.os }}-vagrant-
       -
-        name: Install vagrant and VirtualBox
-        run: |
-          set -x
-          brew tap hashicorp/tap
-          brew install hashicorp/tap/hashicorp-vagrant
-          brew install --cask virtualbox
-      -
-        name: Check versions
+        name: Install vagrant
         run: |
           set -x
+          sudo apt-get update
+          sudo apt-get install -y libvirt-daemon libvirt-daemon-system vagrant vagrant-libvirt ruby-libvirt
+          sudo systemctl enable --now libvirtd
+          sudo chmod a+rw /var/run/libvirt/libvirt-sock
+          vagrant plugin install vagrant-libvirt
           vagrant --version
-          VBoxManage -v
       -
         name: Set up vagrant
         run: |
+          ln -sf hack/Vagrantfile.freebsd Vagrantfile
           vagrant up --no-tty
       -
         name: Smoke test
@@ -233,7 +230,3 @@ jobs:
         if: always()
         run: |
           vagrant ssh -- "sudo cat /vagrant/.tmp/logs/containerd"
-      -
-        name: Dump context
-        if: failure()
-        uses: crazy-max/ghaction-dump-context@v2
diff --git a/hack/Vagrantfile.freebsd13 b/hack/Vagrantfile.freebsd
similarity index 95%
rename from hack/Vagrantfile.freebsd13
rename to hack/Vagrantfile.freebsd
index 837f6a41830a..31d42f6fa5fd 100644
--- a/hack/Vagrantfile.freebsd13
+++ b/hack/Vagrantfile.freebsd
@@ -2,10 +2,7 @@
 # vi: set ft=ruby :
 
 Vagrant.configure("2") do |config|
-  config.vm.define "fbsd_13_2" do |fbsd_13_2|
-    fbsd_13_2.vm.box = "freebsd/FreeBSD-13.2-RELEASE"
-  end
-
+  config.vm.box = "generic/freebsd14"
   config.vm.boot_timeout = 900
   config.vm.synced_folder ".", "/vagrant", type: "rsync"
   config.ssh.keep_alive = true