mirror of
https://github.com/ansible-collections/community.general.git
synced 2026-04-18 23:01:14 +00:00
[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 ef656cb9b6)
Co-authored-by: Felix Fontein <felix@fontein.de>
This commit is contained in:
@@ -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
|
||||
|
||||
2
changelogs/fragments/11836-fixes.yml
Normal file
2
changelogs/fragments/11836-fixes.yml
Normal file
@@ -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)."
|
||||
@@ -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):
|
||||
|
||||
6
tests/integration/targets/android_sdk/vars/Fedora-44.yml
Normal file
6
tests/integration/targets/android_sdk/vars/Fedora-44.yml
Normal file
@@ -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
|
||||
@@ -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:
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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
|
||||
@@ -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:
|
||||
|
||||
Reference in New Issue
Block a user