Skip to content

Commit 0a579e0

Browse files
authored
ansible: move Fedora 41 hosts to Fedora 43 (#4266)
1 parent 0267c21 commit 0a579e0

4 files changed

Lines changed: 6 additions & 39 deletions

File tree

ansible/inventory.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -95,10 +95,10 @@ hosts:
9595
- digitalocean:
9696
debian11-x64-1: {ip: 174.138.79.159, swap_file_size_mb: 2048}
9797
debian12-x64-1: {ip: 159.203.105.159, swap_file_size_mb: 2048}
98-
fedora41-x64-1: {ip: 165.227.191.35}
99-
fedora41-x64-2: {ip: 159.65.246.5}
10098
fedora42-x64-1: {ip: 174.138.62.120}
10199
fedora42-x64-2: {ip: 104.131.92.208}
100+
fedora43-x64-1: {ip: 165.227.191.35}
101+
fedora43-x64-2: {ip: 159.65.246.5}
102102
freebsd13-x64-1: {ip: 138.197.25.49, user: freebsd, swap_file_size_mb: 2048}
103103
freebsd13-x64-2: {ip: 159.89.188.229, user: freebsd, swap_file_size_mb: 2048}
104104
rhel8-x64-1: {ip: 161.35.139.78, build_test_v8: yes, swap_file_size_mb: 2048}

ansible/roles/bootstrap/tasks/partials/digitalocean/fedora40.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

ansible/roles/bootstrap/tasks/partials/fedora.yml

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,18 +7,14 @@
77
# use our own logic. Perhaps better to avoid ansible facts altogether?
88
#
99

10-
- name: check for {{ 'libselinux-python' if os in ("fedora30") else 'python3-libselinux' }} bindings
11-
raw: dnf info {{ 'libselinux-python' if os in ("fedora30") else 'python3-libselinux' }} | grep Installed
10+
- name: check for python3-libselinux bindings
11+
raw: dnf info python3-libselinux | grep Installed
1212
check_mode: no
1313
register: has_libselinux
1414
failed_when: has_libselinux.rc > 1
1515

16-
- name: install libselinux-python bindings
17-
when: os in ("fedora30") and has_libselinux.rc == 1
18-
raw: dnf install -y libselinux-python
19-
2016
- name: install python3-libselinux bindings
21-
when: os not in ("fedora30") and has_libselinux.rc == 1
17+
when: has_libselinux.rc == 1
2218
raw: dnf install -y python3-libselinux
2319

2420
- name: disable selinux
@@ -35,8 +31,3 @@
3531
- name: remove firewalld
3632
when: has_firewalld.rc == 0
3733
raw: dnf remove -y firewalld
38-
39-
# https://github.com/ansible/ansible/issues/84206
40-
- name: install python3-libdnf5
41-
when: os in ("fedora41")
42-
raw: dnf install -y python3-libdnf5

ansible/roles/java-base/vars/main.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ packages: {
88
'centos': 'java-11-openjdk-headless',
99
'debian11': 'openjdk-17-jre-headless',
1010
'debian12': 'openjdk-17-jre-headless',
11-
'fedora': 'java-17-openjdk-headless',
1211
'fedora42': 'java-21-openjdk-headless',
12+
'fedora43': 'java-25-openjdk-headless',
1313
'freebsd': 'openjdk17-jre',
1414
'macos': 'temurin17',
1515
'rhel7': 'java-11-openjdk',

0 commit comments

Comments
 (0)