Skip to content

Commit 33b6ec2

Browse files
committed
ci/cirrus: use vagrant from hashicorp repo
A version of vagrant available from the stock repos (2.2.19) is too old and contains a bug that prevents downloading Fedora 38 image (see [1]). Use packages from hashicorp repo, which currently has vagrant 2.3.4. This resolves the problem of downloading the latest Fedora image. Also, vagrant-libvirt plugin from Ubuntu repos is not working with vagrant from hashicorp, so switch to using "vagrant plugin install". The downside it, this takes extra 4 minutes or so in our CI, and I am not sure how to cache it or speed it up. [1] #3835 (comment) Signed-off-by: Kir Kolyshkin <[email protected]>
1 parent 30f9f80 commit 33b6ec2

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

.cirrus.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,15 @@ task:
3737
# -----
3838
cat /proc/cpuinfo
3939
install_libvirt_vagrant_script: |
40+
curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo gpg --dearmor -o /usr/share/keyrings/hashicorp-archive-keyring.gpg
41+
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
42+
sudo sed -i 's/^# deb-src/deb-src/' /etc/apt/sources.list
4043
apt-get update
41-
apt-get install -y libvirt-daemon libvirt-daemon-system vagrant vagrant-libvirt
44+
apt-get install -y libvirt-daemon libvirt-daemon-system vagrant
4245
systemctl enable --now libvirtd
46+
apt-get build-dep -y vagrant ruby-libvirt
47+
apt-get install -y --no-install-recommends libxslt-dev libxml2-dev libvirt-dev ruby-bundler ruby-dev zlib1g-dev
48+
vagrant plugin install vagrant-libvirt
4349
vagrant_cache:
4450
fingerprint_script: uname -s ; cat Vagrantfile.$DISTRO
4551
folder: /root/.vagrant.d

0 commit comments

Comments
 (0)