From d0b124c3933d3d52260a2dd553feaacf08777fa6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Micha=C3=ABl=20Zasso?= Date: Fri, 6 Mar 2026 11:02:36 +0100 Subject: [PATCH] ansible: move Fedora 41 hosts to Fedora 43 Also cleanup some outdated config for old Fedora versions. Closes: https://github.com/nodejs/build/issues/4248 --- ansible/inventory.yml | 4 ++-- .../tasks/partials/digitalocean/fedora40.yml | 24 ------------------- .../roles/bootstrap/tasks/partials/fedora.yml | 15 +++--------- ansible/roles/java-base/vars/main.yml | 2 +- 4 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 ansible/roles/bootstrap/tasks/partials/digitalocean/fedora40.yml diff --git a/ansible/inventory.yml b/ansible/inventory.yml index 13032f286..433bb2196 100644 --- a/ansible/inventory.yml +++ b/ansible/inventory.yml @@ -95,10 +95,10 @@ hosts: - digitalocean: debian11-x64-1: {ip: 174.138.79.159, swap_file_size_mb: 2048} debian12-x64-1: {ip: 159.203.105.159, swap_file_size_mb: 2048} - fedora41-x64-1: {ip: 165.227.191.35} - fedora41-x64-2: {ip: 159.65.246.5} fedora42-x64-1: {ip: 174.138.62.120} fedora42-x64-2: {ip: 104.131.92.208} + fedora43-x64-1: {ip: 165.227.191.35} + fedora43-x64-2: {ip: 159.65.246.5} freebsd13-x64-1: {ip: 138.197.25.49, user: freebsd, swap_file_size_mb: 2048} freebsd13-x64-2: {ip: 159.89.188.229, user: freebsd, swap_file_size_mb: 2048} rhel8-x64-1: {ip: 161.35.139.78, build_test_v8: yes, swap_file_size_mb: 2048} diff --git a/ansible/roles/bootstrap/tasks/partials/digitalocean/fedora40.yml b/ansible/roles/bootstrap/tasks/partials/digitalocean/fedora40.yml deleted file mode 100644 index 9c6c6cdf7..000000000 --- a/ansible/roles/bootstrap/tasks/partials/digitalocean/fedora40.yml +++ /dev/null @@ -1,24 +0,0 @@ ---- - -# DigitalOcean Fedora 40 - -- name: "{{ provider }} : create systemd-resolved configuration directory" - ansible.builtin.file: - state: directory - path: /etc/systemd/resolved.conf.d - -- name: "{{ provider }} : create DNS settings file" - ansible.builtin.copy: - dest: /etc/systemd/resolved.conf.d/cloudflare.conf - src: "{{ os }}-resolv.conf" - register: resolved - -- name: "{{ provider }} : restart systemd-resolved" - ansible.builtin.service: - name: systemd-resolved - state: restarted - when: resolved.changed - -- name: "{{ provider }} : reboot machine" - ansible.builtin.reboot: - when: resolved.changed diff --git a/ansible/roles/bootstrap/tasks/partials/fedora.yml b/ansible/roles/bootstrap/tasks/partials/fedora.yml index 2bed92855..4ca71f603 100644 --- a/ansible/roles/bootstrap/tasks/partials/fedora.yml +++ b/ansible/roles/bootstrap/tasks/partials/fedora.yml @@ -7,18 +7,14 @@ # use our own logic. Perhaps better to avoid ansible facts altogether? # -- name: check for {{ 'libselinux-python' if os in ("fedora30") else 'python3-libselinux' }} bindings - raw: dnf info {{ 'libselinux-python' if os in ("fedora30") else 'python3-libselinux' }} | grep Installed +- name: check for python3-libselinux bindings + raw: dnf info python3-libselinux | grep Installed check_mode: no register: has_libselinux failed_when: has_libselinux.rc > 1 -- name: install libselinux-python bindings - when: os in ("fedora30") and has_libselinux.rc == 1 - raw: dnf install -y libselinux-python - - name: install python3-libselinux bindings - when: os not in ("fedora30") and has_libselinux.rc == 1 + when: has_libselinux.rc == 1 raw: dnf install -y python3-libselinux - name: disable selinux @@ -35,8 +31,3 @@ - name: remove firewalld when: has_firewalld.rc == 0 raw: dnf remove -y firewalld - -# https://github.com/ansible/ansible/issues/84206 -- name: install python3-libdnf5 - when: os in ("fedora41") - raw: dnf install -y python3-libdnf5 diff --git a/ansible/roles/java-base/vars/main.yml b/ansible/roles/java-base/vars/main.yml index 628acf63e..8fb3df43f 100644 --- a/ansible/roles/java-base/vars/main.yml +++ b/ansible/roles/java-base/vars/main.yml @@ -8,8 +8,8 @@ packages: { 'centos': 'java-11-openjdk-headless', 'debian11': 'openjdk-17-jre-headless', 'debian12': 'openjdk-17-jre-headless', - 'fedora': 'java-17-openjdk-headless', 'fedora42': 'java-21-openjdk-headless', + 'fedora43': 'java-25-openjdk-headless', 'freebsd': 'openjdk17-jre', 'macos': 'temurin17', 'rhel7': 'java-11-openjdk',