Skip to content

Commit d83c6c9

Browse files
committed
Vagrant images: prepare for fedora 42 and fix rawhide
- The base image for Rawhide has been renamed and contains . instead of - for instance Fedora-Cloud-Base-Vagrant-VirtualBox-Rawhide-20250325.n.0.x86_64.vagrant.virtualbox.box - Prepare for f42 image, add variables and config file Signed-off-by: Florence Blanc-Renaud <[email protected]>
1 parent 49b1c6f commit d83c6c9

File tree

4 files changed

+15
-5
lines changed

4 files changed

+15
-5
lines changed

ansible/roles/box/prepare/tasks/download_nightly_box.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111

1212
- name: download latest nightly box ({{ fedora_releasever }})
1313
shell: >
14-
wget -r -np -nH --cut-dirs=9 -A
15-
'Fedora-Cloud-Base-Vagrant-{{ fedora_version.capitalize() }}-*x86_64.vagrant-libvirt.box'
14+
wget -r -np -nH --cut-dirs=9 --accept-regex
15+
'Fedora-Cloud-Base-Vagrant-libvirt-{{ fedora_version.capitalize() }}-.*x86_64.vagrant.libvirt.box'
1616
{{ fedora_nightly_images_remote_dir }}
1717
args:
1818
chdir: "{{ fedora_nightly_template_dir }}"

ansible/roles/machine/setup/tasks/install_packages.yml

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
- name: remove packages that cause conflicts on rawhide
99
dnf:
1010
name:
11-
- gdbm
1211
- python2-chardet
1312
state: absent
1413
when: fedora_version in ['rawhide', '30']
@@ -59,13 +58,21 @@
5958
- vim
6059
- NetworkManager
6160
- xorg-x11-server-Xvfb
62-
- firefox
6361
- python3-paramiko
6462
- python3-pip
6563
- firewalld
6664
- nfs-utils
6765
- kernel-modules
6866

67+
# firefox installation may fail due to openh264 conflict
68+
# allowerasing to prevent install failure
69+
- name: install additional packages
70+
dnf:
71+
state: latest
72+
allowerasing: true
73+
name:
74+
- firefox
75+
6976
- name: install Ansible dependencies
7077
dnf:
7178
name:

ansible/vars/fedora/42.yml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
---
2+
fedora_releasever: 42
3+
base_box_url: https://dl.fedoraproject.org/pub/fedora/linux/releases/test/42_Beta/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-libvirt-42_Beta-1.4.x86_64.vagrant.libvirt.box

ansible/vars/fedora/rawhide.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
fedora_releasever: 42 # bump when fedora gets branched
2+
fedora_releasever: 43 # bump when fedora gets branched
33

44
nightly_compose: true
55

0 commit comments

Comments
 (0)