Skip to content

Commit

Permalink
Merge pull request #1342 from vojtechtrefny/main_yaml-deps
Browse files Browse the repository at this point in the history
misc: Add python3-yaml to test dependencies
  • Loading branch information
vojtechtrefny authored Feb 11, 2025
2 parents b07e2d7 + df6a8fb commit 632a24e
Show file tree
Hide file tree
Showing 2 changed files with 20 additions and 17 deletions.
34 changes: 17 additions & 17 deletions misc/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
3 changes: 3 additions & 0 deletions misc/blivet-tasks.yml
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
- python3-libmount
- python3-libvirt
- python3-paramiko
- python3-yaml
- targetcli
- iscsi-initiator-utils
- gfs2-utils
Expand Down Expand Up @@ -91,6 +92,7 @@
- python3-libmount
- python3-libvirt
- python3-pip
- python3-yaml
- targetcli
- iscsi-initiator-utils
- stratisd
Expand Down Expand Up @@ -165,6 +167,7 @@
- python3-paramiko
- python3-libvirt
- python3-pip
- python3-yaml
- targetcli-fb
- open-iscsi
- gfs2-utils
Expand Down

0 comments on commit 632a24e

Please sign in to comment.