Skip to content

Commit

Permalink
Increased Fedora test version to 41
Browse files Browse the repository at this point in the history
Keeping up with the latest release.
  • Loading branch information
freemanjp committed Nov 18, 2024
1 parent 70b298a commit e31cc87
Show file tree
Hide file tree
Showing 13 changed files with 86 additions and 20 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ Requirements

* Fedora

* 35
* 41

* SUSE Family

Expand Down
2 changes: 1 addition & 1 deletion meta/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ galaxy_info:
- '9'
- name: Fedora
versions:
- '35'
- '41'
- name: opensuse
versions:
- 'all'
Expand Down
2 changes: 1 addition & 1 deletion molecule/fedora-java-min-online/molecule.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ role_name_check: 2

platforms:
- name: ansible-role-java-fedora
image: fedora:35
image: fedora:41

provisioner:
name: ansible
Expand Down
11 changes: 9 additions & 2 deletions molecule/java-max-lts-offline/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
changed_when: false
when: ansible_pkg_mgr == 'apt'

# Workaround for Fedora 41 https://github.com/ansible/ansible/issues/84206
- name: Install python3-libdnf5
become: true
ansible.builtin.command: dnf install -y python3-libdnf5
when: ansible_facts.pkg_mgr == 'dnf5'
changed_when: false

- name: Create local archive directory
ansible.builtin.file:
state: directory
Expand Down Expand Up @@ -44,7 +51,7 @@
- ansible_local.java.general.home is defined

- name: Install find - required for tests (dnf)
ansible.builtin.dnf:
ansible.builtin.package:
name: findutils
state: present
when: ansible_pkg_mgr == 'dnf'
when: ansible_pkg_mgr in ('dnf', 'dnf5')
11 changes: 9 additions & 2 deletions molecule/java-max-lts-online/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
changed_when: false
when: ansible_pkg_mgr == 'apt'

# Workaround for Fedora 41 https://github.com/ansible/ansible/issues/84206
- name: Install python3-libdnf5
become: true
ansible.builtin.command: dnf install -y python3-libdnf5
when: ansible_facts.pkg_mgr == 'dnf5'
changed_when: false

roles:
- role: ansible-role-java
java_use_local_archive: false
Expand All @@ -22,7 +29,7 @@
- ansible_local.java.general.home is defined

- name: Install find - required for tests (dnf)
ansible.builtin.dnf:
ansible.builtin.package:
name: findutils
state: present
when: ansible_pkg_mgr == 'dnf'
when: ansible_pkg_mgr in ('dnf', 'dnf5')
11 changes: 9 additions & 2 deletions molecule/java-max-non-lts-offline/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
changed_when: false
when: ansible_pkg_mgr == 'apt'

# Workaround for Fedora 41 https://github.com/ansible/ansible/issues/84206
- name: Install python3-libdnf5
become: true
ansible.builtin.command: dnf install -y python3-libdnf5
when: ansible_facts.pkg_mgr == 'dnf5'
changed_when: false

- name: Create local archive directory
ansible.builtin.file:
state: directory
Expand Down Expand Up @@ -43,7 +50,7 @@
- ansible_local.java.general.home is defined

- name: Install find - required for tests (dnf)
ansible.builtin.dnf:
ansible.builtin.package:
name: findutils
state: present
when: ansible_pkg_mgr == 'dnf'
when: ansible_pkg_mgr in ('dnf', 'dnf5')
11 changes: 9 additions & 2 deletions molecule/java-max-non-lts-online/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
changed_when: false
when: ansible_pkg_mgr == 'apt'

# Workaround for Fedora 41 https://github.com/ansible/ansible/issues/84206
- name: Install python3-libdnf5
become: true
ansible.builtin.command: dnf install -y python3-libdnf5
when: ansible_facts.pkg_mgr == 'dnf5'
changed_when: false

roles:
- role: ansible-role-java
java_version: '20'
Expand All @@ -23,7 +30,7 @@
- ansible_local.java.general.home is defined

- name: Install find - required for tests (dnf)
ansible.builtin.dnf:
ansible.builtin.package:
name: findutils
state: present
when: ansible_pkg_mgr == 'dnf'
when: ansible_pkg_mgr in ('dnf', 'dnf5')
11 changes: 9 additions & 2 deletions molecule/java-min-offline/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
changed_when: false
when: ansible_pkg_mgr == 'apt'

# Workaround for Fedora 41 https://github.com/ansible/ansible/issues/84206
- name: Install python3-libdnf5
become: true
ansible.builtin.command: dnf install -y python3-libdnf5
when: ansible_facts.pkg_mgr == 'dnf5'
changed_when: false

- name: Create local archive directory
ansible.builtin.file:
state: directory
Expand Down Expand Up @@ -47,7 +54,7 @@
- ansible_local.java.general.home is defined

- name: Install find - required for tests (dnf)
ansible.builtin.dnf:
ansible.builtin.package:
name: findutils
state: present
when: ansible_pkg_mgr == 'dnf'
when: ansible_pkg_mgr in ('dnf', 'dnf5')
11 changes: 9 additions & 2 deletions molecule/java-min-online/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
changed_when: false
when: ansible_pkg_mgr == 'apt'

# Workaround for Fedora 41 https://github.com/ansible/ansible/issues/84206
- name: Install python3-libdnf5
become: true
ansible.builtin.command: dnf install -y python3-libdnf5
when: ansible_facts.pkg_mgr == 'dnf5'
changed_when: false

roles:
- role: ansible-role-java
java_version: 8.0.402+6
Expand All @@ -23,7 +30,7 @@
- ansible_local.java.general.home is defined

- name: Install find - required for tests (dnf)
ansible.builtin.dnf:
ansible.builtin.package:
name: findutils
state: present
when: ansible_pkg_mgr == 'dnf'
when: ansible_pkg_mgr in ('dnf', 'dnf5')
11 changes: 9 additions & 2 deletions molecule/java-old-lts-offline/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
changed_when: false
when: ansible_pkg_mgr == 'apt'

# Workaround for Fedora 41 https://github.com/ansible/ansible/issues/84206
- name: Install python3-libdnf5
become: true
ansible.builtin.command: dnf install -y python3-libdnf5
when: ansible_facts.pkg_mgr == 'dnf5'
changed_when: false

- name: Create local archive directory
ansible.builtin.file:
state: directory
Expand Down Expand Up @@ -43,7 +50,7 @@
- ansible_local.java.general.home is defined

- name: Install find - required for tests (dnf)
ansible.builtin.dnf:
ansible.builtin.package:
name: findutils
state: present
when: ansible_pkg_mgr == 'dnf'
when: ansible_pkg_mgr in ('dnf', 'dnf5')
11 changes: 9 additions & 2 deletions molecule/java-old-lts-online/converge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@
changed_when: false
when: ansible_pkg_mgr == 'apt'

# Workaround for Fedora 41 https://github.com/ansible/ansible/issues/84206
- name: Install python3-libdnf5
become: true
ansible.builtin.command: dnf install -y python3-libdnf5
when: ansible_facts.pkg_mgr == 'dnf5'
changed_when: false

roles:
- role: ansible-role-java
java_version: '11'
Expand All @@ -23,7 +30,7 @@
- ansible_local.java.general.home is defined

- name: Install find - required for tests (dnf)
ansible.builtin.dnf:
ansible.builtin.package:
name: findutils
state: present
when: ansible_pkg_mgr == 'dnf'
when: ansible_pkg_mgr in ('dnf', 'dnf5')
2 changes: 1 addition & 1 deletion tasks/adoptium.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@
ansible.builtin.package:
name: '{{ java_dependencies }}'
state: present
when: ansible_pkg_mgr in ('apt', 'yum', 'dnf', 'zypper')
when: ansible_pkg_mgr in ('apt', 'yum', 'dnf', 'dnf5', 'zypper')

# Workaround for: https://github.com/AdoptOpenJDK/openjdk-build/issues/660
- name: Check JDK archive layout
Expand Down
10 changes: 10 additions & 0 deletions vars/packages/dnf5.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
# code: language=ansible
---
# Dependencies required to install/use Java
java_dependencies:
- tar
- gzip
- unzip
- freetype
- fontconfig
- dejavu-sans-fonts

0 comments on commit e31cc87

Please sign in to comment.