Skip to content

Commit

Permalink
ci: Fix dnf5
Browse files Browse the repository at this point in the history
  • Loading branch information
jakub-vavra-cz committed Jun 5, 2024
1 parent dc1709d commit eb2ed9b
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 9 deletions.
15 changes: 8 additions & 7 deletions src/ansible/roles/packages/tasks/Fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,11 +67,12 @@

- name: Install extended set of packages
block:
- name: Install additional repositories
shell: |
dnf config-manager --add-repo {{ item }}
with_items:
- https://cli.github.com/packages/rpm/gh-cli.repo
- name: Add gh-cli.repo repo
ansible.builtin.get_url:
url: https://cli.github.com/packages/rpm/gh-cli.repo
dest: /etc/yum.repos.d/gh-cli.repo
mode: '0644'

- name: Install additional packages
dnf:
state: present
Expand Down Expand Up @@ -124,10 +125,10 @@
- nfs-utils
- realmd
- sssd
- sssd-*
- 'sssd-\*'

- name: Install debug information for selected packages
command: dnf debuginfo-install -y {{ item }}
command: dnf install --enablerepo='*-debug*' -y {{ item }}-debuginfo
with_items:
- dbus
- glibc
Expand Down
4 changes: 2 additions & 2 deletions src/build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -68,9 +68,9 @@ function base_install_python {
fi
fi

# Remove dnf-5 to workaround many issues that yet needs to be fixed
# Add python3-dnf5 to enable ansible to use it
if base_exec '[ -f /usr/bin/dnf5 ]'; then
base_exec 'dnf install -y python3-dnf && dnf remove -y dnf5 && ln -s /usr/bin/dnf-3 /usr/bin/dnf && ln -s /usr/bin/dnf-3 /usr/bin/yum && dnf clean all'
base_exec 'dnf install -y python3-libdnf5 dnf5-plugins'
fi
}

Expand Down

0 comments on commit eb2ed9b

Please sign in to comment.