Merge pull request #3848 from kolyshkin/bump-vagrant

ci/cirrus: use vagrant from hashicorp repo, bump Fedora to 38, bump bats

Author: thaJeztah

.cirrus.yml

@@ -37,9 +37,15 @@ task:
     # -----
     cat /proc/cpuinfo
   install_libvirt_vagrant_script: |
+    curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
+    echo "deb [signed-by=/usr/share/keyrings/hashicorp-archive-keyring.gpg] https://apt.releases.hashicorp.com $(lsb_release -cs) main" | sudo tee /etc/apt/sources.list.d/hashicorp.list
+    sudo sed -i 's/^# deb-src/deb-src/' /etc/apt/sources.list
     apt-get update
-    apt-get install -y libvirt-daemon libvirt-daemon-system vagrant vagrant-libvirt
+    apt-get install -y libvirt-daemon libvirt-daemon-system vagrant
     systemctl enable --now libvirtd
+    apt-get build-dep -y vagrant ruby-libvirt
+    apt-get install -y --no-install-recommends libxslt-dev libxml2-dev libvirt-dev ruby-bundler ruby-dev zlib1g-dev
+    vagrant plugin install vagrant-libvirt
   vagrant_cache:
     fingerprint_script: uname -s ; cat Vagrantfile.$DISTRO
     folder: /root/.vagrant.d
@@ -71,7 +77,7 @@ task:
     HOME: /root
     CIRRUS_WORKING_DIR: /home/runc
     GO_VERSION: "1.19"
-    BATS_VERSION: "v1.8.2"
+    BATS_VERSION: "v1.9.0"
     RPMS: gcc git iptables jq glibc-static libseccomp-devel make criu fuse-sshfs
     # yamllint disable rule:key-duplicates
     matrix:

.github/workflows/test.yml

@@ -76,7 +76,7 @@ jobs:
     - name: install bats
       uses: mig4/setup-bats@v1
       with:
-        bats-version: 1.8.2
+        bats-version: 1.9.0
 
     - name: unit test
       if: matrix.rootless != 'rootless'

Dockerfile

@@ -1,5 +1,5 @@
 ARG GO_VERSION=1.20
-ARG BATS_VERSION=v1.8.2
+ARG BATS_VERSION=v1.9.0
 ARG LIBSECCOMP_VERSION=2.5.4
 
 FROM golang:${GO_VERSION}-bullseye

Vagrantfile.fedora

@@ -3,7 +3,7 @@
 
 Vagrant.configure("2") do |config|
 # Fedora box is used for testing cgroup v2 support
-  config.vm.box = "fedora/37-cloud-base"
+  config.vm.box = "fedora/38-cloud-base"
   config.vm.provider :virtualbox do |v|
     v.memory = 2048
     v.cpus = 2