From 729eb996e80401179cb64c8ae775b63140c07711 Mon Sep 17 00:00:00 2001 From: "patchback[bot]" <45432694+patchback[bot]@users.noreply.github.com> Date: Thu, 16 Apr 2026 22:00:37 +0200 Subject: [PATCH] [PR #11836/ef656cb9 backport][stable-12] CI: Replace Fedora 43 with 44 for devel (#11846) CI: Replace Fedora 43 with 44 for devel (#11836) * Replace Fedora 43 with 44 for devel in CI. * Adjust tests. * Adjust flatpak module to Fedora 44. (cherry picked from commit ef656cb9b6062aa18c9809004d964951470072e3) Co-authored-by: Felix Fontein --- .azure-pipelines/azure-pipelines.yml | 8 ++++---- changelogs/fragments/11836-fixes.yml | 2 ++ plugins/modules/flatpak.py | 4 +++- tests/integration/targets/android_sdk/vars/Fedora-44.yml | 6 ++++++ .../targets/cloud_init_data_facts/tasks/main.yml | 2 +- tests/integration/targets/iso_extract/tasks/main.yml | 4 ++-- .../targets/setup_java_keytool/vars/Fedora-44.yml | 7 +++++++ .../targets/setup_postgresql_db/tasks/main.yml | 4 ++++ 8 files changed, 29 insertions(+), 8 deletions(-) create mode 100644 changelogs/fragments/11836-fixes.yml create mode 100644 tests/integration/targets/android_sdk/vars/Fedora-44.yml create mode 100644 tests/integration/targets/setup_java_keytool/vars/Fedora-44.yml diff --git a/.azure-pipelines/azure-pipelines.yml b/.azure-pipelines/azure-pipelines.yml index 206b7391f9..5ae4f3b33b 100644 --- a/.azure-pipelines/azure-pipelines.yml +++ b/.azure-pipelines/azure-pipelines.yml @@ -198,8 +198,8 @@ stages: targets: - name: Alpine 3.23 test: alpine/3.23 - # - name: Fedora 43 - # test: fedora/43 + # - name: Fedora 44 + # test: fedora/44 - name: Ubuntu 22.04 test: ubuntu/22.04 - name: Ubuntu 24.04 @@ -308,8 +308,8 @@ stages: parameters: testFormat: devel/linux/{0} targets: - - name: Fedora 43 - test: fedora43 + - name: Fedora 44 + test: fedora44 - name: Alpine 3.23 test: alpine323 - name: Ubuntu 22.04 diff --git a/changelogs/fragments/11836-fixes.yml b/changelogs/fragments/11836-fixes.yml new file mode 100644 index 0000000000..dde79a361a --- /dev/null +++ b/changelogs/fragments/11836-fixes.yml @@ -0,0 +1,2 @@ +bugfixes: + - "flatpak - support new output message when an update resulted in no action that appears on Fedora 44 (https://github.com/ansible-collections/community.general/pull/11836)." diff --git a/plugins/modules/flatpak.py b/plugins/modules/flatpak.py index f87d43d84d..fe3659a006 100644 --- a/plugins/modules/flatpak.py +++ b/plugins/modules/flatpak.py @@ -238,7 +238,9 @@ def update_flat(module, binary, names, method, no_dependencies): command += ["--no-deps"] command += installed_flat_names stdout = _flatpak_command(module, module.check_mode, command) - result["changed"] = True if module.check_mode else stdout.find("Nothing to do.") == -1 + result["changed"] = ( + True if module.check_mode else (stdout.find("Nothing to do.") == -1 and stdout.find("Nothing to update.") == -1) + ) def uninstall_flat(module, binary, names, method): diff --git a/tests/integration/targets/android_sdk/vars/Fedora-44.yml b/tests/integration/targets/android_sdk/vars/Fedora-44.yml new file mode 100644 index 0000000000..dd6258c41b --- /dev/null +++ b/tests/integration/targets/android_sdk/vars/Fedora-44.yml @@ -0,0 +1,6 @@ +--- +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + +openjdk_pkg: java-25-openjdk-headless diff --git a/tests/integration/targets/cloud_init_data_facts/tasks/main.yml b/tests/integration/targets/cloud_init_data_facts/tasks/main.yml index 15dcde777c..a8c3973ab0 100644 --- a/tests/integration/targets/cloud_init_data_facts/tasks/main.yml +++ b/tests/integration/targets/cloud_init_data_facts/tasks/main.yml @@ -28,7 +28,7 @@ - not (ansible_facts.distribution == 'Archlinux') # TODO: package seems to be broken, cannot be downloaded from mirrors? - not (ansible_facts.distribution == 'Alpine') # TODO: not sure what's wrong here, the module doesn't return what the tests expect - not (ansible_facts.distribution == 'Debian' and ansible_facts.distribution_major_version|int == 13) # TODO: not sure what's wrong here, the module doesn't return what the tests expect - - not (ansible_facts.distribution == 'Fedora' and ansible_facts.distribution_major_version|int == 43) # TODO: not sure what's wrong here, the module doesn't return what the tests expect + - not (ansible_facts.distribution == 'Fedora' and ansible_facts.distribution_major_version|int >= 43) # TODO: not sure what's wrong here, the module doesn't return what the tests expect block: - name: setup install cloud-init package: diff --git a/tests/integration/targets/iso_extract/tasks/main.yml b/tests/integration/targets/iso_extract/tasks/main.yml index 0ee27bca00..441eba3ed8 100644 --- a/tests/integration/targets/iso_extract/tasks/main.yml +++ b/tests/integration/targets/iso_extract/tasks/main.yml @@ -14,10 +14,10 @@ output_test_dir: '{{ remote_tmp_dir }}/test_iso_extract' # TODO: figure out and fix! -- name: Doesn't work with Fedora 43 for some reason +- name: Doesn't work with Fedora 43+ for some reason meta: end_play when: - - ansible_facts.distribution == 'Fedora' and ansible_facts.distribution_major_version is version('43', '==') + - ansible_facts.distribution == 'Fedora' and ansible_facts.distribution_major_version is version('43', '>=') - name: Install 7zip import_tasks: 7zip.yml diff --git a/tests/integration/targets/setup_java_keytool/vars/Fedora-44.yml b/tests/integration/targets/setup_java_keytool/vars/Fedora-44.yml new file mode 100644 index 0000000000..d6daa5096b --- /dev/null +++ b/tests/integration/targets/setup_java_keytool/vars/Fedora-44.yml @@ -0,0 +1,7 @@ +--- +# Copyright (c) Ansible Project +# GNU General Public License v3.0+ (see LICENSES/GPL-3.0-or-later.txt or https://www.gnu.org/licenses/gpl-3.0.txt) +# SPDX-License-Identifier: GPL-3.0-or-later + +keytool_package_names: + - java-25-openjdk-headless diff --git a/tests/integration/targets/setup_postgresql_db/tasks/main.yml b/tests/integration/targets/setup_postgresql_db/tasks/main.yml index a3a889a4be..f8b950c8cc 100644 --- a/tests/integration/targets/setup_postgresql_db/tasks/main.yml +++ b/tests/integration/targets/setup_postgresql_db/tasks/main.yml @@ -20,6 +20,10 @@ - meta: end_play when: ansible_facts.distribution == 'Fedora' and ansible_facts.distribution_major_version == '34' +# Temporary disable Fedora 44 +- meta: end_play + when: ansible_facts.distribution == 'Fedora' and ansible_facts.distribution_major_version == '44' + - name: Include distribution and Python version specific variables include_vars: '{{ lookup(''first_found'', params) }}' vars: