From 10a0e60451ea05c556775068a92cb6538f2f6b44 Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Mon, 10 Feb 2025 15:57:51 +0100
Subject: [PATCH 1/2] misc: Add python3-yaml to test dependencies

---
 misc/blivet-tasks.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/misc/blivet-tasks.yml b/misc/blivet-tasks.yml
index 5e35a701c..f9358586f 100644
--- a/misc/blivet-tasks.yml
+++ b/misc/blivet-tasks.yml
@@ -43,6 +43,7 @@
       - python3-libmount
       - python3-libvirt
       - python3-paramiko
+      - python3-yaml
       - targetcli
       - iscsi-initiator-utils
       - gfs2-utils
@@ -91,6 +92,7 @@
       - python3-libmount
       - python3-libvirt
       - python3-pip
+      - python3-yaml
       - targetcli
       - iscsi-initiator-utils
       - stratisd
@@ -165,6 +167,7 @@
       - python3-paramiko
       - python3-libvirt
       - python3-pip
+      - python3-yaml
       - targetcli-fb
       - open-iscsi
       - gfs2-utils

From df6a8fb3d24cf43eda486b59f8ff08f0b3c348de Mon Sep 17 00:00:00 2001
From: Vojtech Trefny <vtrefny@redhat.com>
Date: Mon, 10 Feb 2025 19:36:02 +0100
Subject: [PATCH 2/2] misc: Update Vagrantfile

---
 misc/Vagrantfile | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)

diff --git a/misc/Vagrantfile b/misc/Vagrantfile
index e86058f47..446795e62 100644
--- a/misc/Vagrantfile
+++ b/misc/Vagrantfile
@@ -6,8 +6,8 @@
 # development/testing.
 #
 # Use 'vagrant up && vagrant ssh' to spawn the default machine (most recent
-# Fedora) and ssh into it or e.g. 'vagrant up bl-f40 && vagrant ssh bl-f40' to
-# use a Fedora 40 based machine, etc.
+# Fedora) and ssh into it or e.g. 'vagrant up bl-f42 && vagrant ssh bl-f42' to
+# use a Fedora 42 based machine, etc.
 #
 
 def os_cpu_cores
@@ -34,49 +34,49 @@ Vagrant.configure("2") do |config|
     v.disk_driver :cache => "unsafe"
   end
 
-  config.vm.define "bl-f40", primary: true, autostart: true do |f40|
-    f40.vm.box = "fedora/40-cloud-base"
+  config.vm.define "bl-f42", primary: true, autostart: true do |f42|
+    f42.vm.box = "fedora/42-cloud-base"
 
-    f40.vm.provision "ansible" do |ansible|
+    f42.vm.provision "ansible" do |ansible|
       ansible.playbook = "install-test-dependencies.yml"
       ansible.extra_vars = { ansible_python_interpreter:"/usr/bin/python3" }
     end
   end
 
-  config.vm.define "bl-f39", primary: false, autostart: false do |f39|
-    f39.vm.box = "fedora/39-cloud-base"
+  config.vm.define "bl-f41", primary: false, autostart: false do |f41|
+    f41.vm.box = "fedora/41-cloud-base"
 
-    f39.vm.provision "ansible" do |ansible|
+    f41.vm.provision "ansible" do |ansible|
       ansible.playbook = "install-test-dependencies.yml"
       ansible.extra_vars = { ansible_python_interpreter:"/usr/bin/python3" }
     end
   end
 
-  config.vm.define "bl-c8s", primary: false, autostart: false do |c8s|
-    c8s.vm.box = "generic/centos8s"
+  config.vm.define "bl-c9s", primary: false, autostart: false do |c9s|
+    c9s.vm.box = "centos/stream9"
 
     # install all test dependencies using ansible
-    c8s.vm.provision "ansible" do |ansible|
+    c9s.vm.provision "ansible" do |ansible|
       ansible.playbook = "install-test-dependencies.yml"
       ansible.extra_vars = { ansible_python_interpreter:"/usr/libexec/platform-python" }
     end
   end
 
-  config.vm.define "bl-c9s", primary: false, autostart: false do |c9s|
-    c9s.vm.box = "generic/centos9s"
+  config.vm.define "bl-c10s", primary: false, autostart: false do |c10s|
+    c10s.vm.box = "centos/stream10"
 
     # install all test dependencies using ansible
-    c9s.vm.provision "ansible" do |ansible|
+    c10s.vm.provision "ansible" do |ansible|
       ansible.playbook = "install-test-dependencies.yml"
       ansible.extra_vars = { ansible_python_interpreter:"/usr/libexec/platform-python" }
     end
   end
 
-  config.vm.define "bl-u2310", primary: false, autostart: false do |u2310|
-    u2310.vm.box = "generic/ubuntu2310"
+  config.vm.define "bl-u2404", primary: false, autostart: false do |u2404|
+    u2404.vm.box = "generic/ubuntu2404"
 
     # install all test dependencies using ansible
-    u2310.vm.provision "ansible" do |ansible|
+    u2404.vm.provision "ansible" do |ansible|
       ansible.playbook = "install-test-dependencies.yml"
       ansible.extra_vars = { ansible_python_interpreter:"/usr/bin/python3" }
     end