Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Prepare PRCI for fedora 41 #511

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions ansible/create_template_box.yml
Original file line number Diff line number Diff line change
Expand Up @@ -39,14 +39,21 @@
- vars/ipa_branches/{{ git_branch }}.yml
pre_tasks:
- name: Install cloud-utils-growpart for f40
when: fedora_version == '40'
when: fedora_version >= '40'
command: dnf install -y cloud-utils-growpart
- name: grow partition size /dev/vda4 for f40
when: fedora_version == '40'
when: fedora_version >= '40'
command: growpart /dev/vda 4
- name: resize the / filesystem for f40
when: fedora_version == '40'
when: fedora_version >= '40'
command: btrfs filesystem resize max /
- name: Stat /usr/bin/dnf5
ansible.builtin.stat:
path: /usr/bin/dnf5
register: dnf5
- name: Install dnf5 support libs
ansible.builtin.command: dnf5 install -y python3-libdnf5 dnf5-plugins
when: dnf5.stat.exists
# GPG keys might be outdated for packages in Rawhide
- name: Update fedora-repos package
when: nightly_compose is defined and nightly_compose
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/box/prepare/templates/Vagrantfile.j2
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ Vagrant.configure(2) do |config|
template.vm.provider "libvirt" do |domain,override|
domain.memory = 2048
override.vm.network "private_network", type: "dhcp"
{% if fedora_version == '40' %}
{% if fedora_version >= '40' %}
domain.machine_virtual_size = 20
{% endif %}
end
Expand Down
6 changes: 3 additions & 3 deletions ansible/roles/machine/setup/tasks/configuration.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,22 +10,22 @@
policy: targeted

- name: disable distro repositories
shell: "dnf config-manager --set-disabled {{ item }}"
shell: "dnf config-manager setopt {{ item }}.enabled=0"
with_items:
- fedora
- updates
- updates-testing
- fedora-cisco-openh264

- name: enable selected repositories
shell: "dnf config-manager --set-enabled {{ item.key }}"
shell: "dnf config-manager setopt {{ item.key }}.enabled=1"
with_dict:
fedora: "{{ repo_fedora_enabled }}"
updates: "{{ repo_updates_enabled }}"
when: fedora_version != 'rawhide' and item.value

- name: configure rawhide repository
shell: "dnf config-manager --set-{{ 'enabled' if repo_rawhide_enabled else 'disabled' }} rawhide"
shell: "dnf config-manager setopt rawhide.enabled={{ '1' if repo_rawhide_enabled else '0' }}"
when: fedora_version == 'rawhide'

- name: configure FreeIPA COPR repo
Expand Down
2 changes: 1 addition & 1 deletion ansible/roles/machine/setup/tasks/install_packages.yml
Original file line number Diff line number Diff line change
Expand Up @@ -151,4 +151,4 @@
url: "{{ download_metadata.json | to_json | from_json | json_query(query) }}"
dest: /opt/selenium.jar
vars:
query: "assets[?content_type == 'application/java-archive'] | [?starts_with(name, 'selenium-server')].browser_download_url | [0]"
query: "assets[?content_type == 'raw'] | [?ends_with(name, 'jar')] | [?starts_with(name, 'selenium-server')].browser_download_url | [0]"
3 changes: 3 additions & 0 deletions ansible/vars/fedora/41.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
---
fedora_releasever: 41
base_box_url: https://dl.fedoraproject.org/pub/fedora/linux/releases/41/Cloud/x86_64/images/Fedora-Cloud-Base-Vagrant-libvirt-41-1.4.x86_64.vagrant.libvirt.box
2 changes: 1 addition & 1 deletion ansible/vars/fedora/rawhide.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
---
fedora_releasever: 41 # bump when fedora gets branched
fedora_releasever: 42 # bump when fedora gets branched

nightly_compose: true

Expand Down