[PR #9552/bf69dc46 backport][stable-9] CI: Add Fedora 41, Alpine 3.21, RHEL 9.5, FreeBSD 14.2 to CI for devel (#9557)
CI: Add Fedora 41, Alpine 3.21, RHEL 9.5, FreeBSD 14.2 to CI for devel (#9552)
* Add Fedora 41, Alpine 3.21, RHEL 9.5, FreeBSD 14.2 to CI for devel.
* Add some ignores that are likely needed.
* Try to fix/ignore various errors.
* Fix redis setup on Fedora 41.
* Undo disable yum_versionlock since it's already globally disabled.
(cherry picked from commit bf69dc46ff
)
Co-authored-by: Felix Fontein <felix@fontein.de>
pull/9589/head
parent
d1f7752b57
commit
0361154ff3
|
@ -172,10 +172,10 @@ stages:
|
||||||
parameters:
|
parameters:
|
||||||
testFormat: devel/{0}
|
testFormat: devel/{0}
|
||||||
targets:
|
targets:
|
||||||
- name: Alpine 3.20
|
- name: Alpine 3.21
|
||||||
test: alpine/3.20
|
test: alpine/3.21
|
||||||
# - name: Fedora 40
|
# - name: Fedora 41
|
||||||
# test: fedora/40
|
# test: fedora/41
|
||||||
- name: Ubuntu 22.04
|
- name: Ubuntu 22.04
|
||||||
test: ubuntu/22.04
|
test: ubuntu/22.04
|
||||||
- name: Ubuntu 24.04
|
- name: Ubuntu 24.04
|
||||||
|
@ -192,10 +192,10 @@ stages:
|
||||||
targets:
|
targets:
|
||||||
- name: macOS 14.3
|
- name: macOS 14.3
|
||||||
test: macos/14.3
|
test: macos/14.3
|
||||||
- name: RHEL 9.4
|
- name: RHEL 9.5
|
||||||
test: rhel/9.4
|
test: rhel/9.5
|
||||||
- name: FreeBSD 14.1
|
- name: FreeBSD 14.2
|
||||||
test: freebsd/14.1
|
test: freebsd/14.2
|
||||||
- name: FreeBSD 13.4
|
- name: FreeBSD 13.4
|
||||||
test: freebsd/13.4
|
test: freebsd/13.4
|
||||||
groups:
|
groups:
|
||||||
|
@ -212,6 +212,8 @@ stages:
|
||||||
targets:
|
targets:
|
||||||
- name: RHEL 9.4
|
- name: RHEL 9.4
|
||||||
test: rhel/9.4
|
test: rhel/9.4
|
||||||
|
- name: FreeBSD 14.1
|
||||||
|
test: freebsd/14.1
|
||||||
groups:
|
groups:
|
||||||
- 1
|
- 1
|
||||||
- 2
|
- 2
|
||||||
|
@ -266,10 +268,10 @@ stages:
|
||||||
parameters:
|
parameters:
|
||||||
testFormat: devel/linux/{0}
|
testFormat: devel/linux/{0}
|
||||||
targets:
|
targets:
|
||||||
- name: Fedora 40
|
- name: Fedora 41
|
||||||
test: fedora40
|
test: fedora41
|
||||||
- name: Alpine 3.20
|
- name: Alpine 3.21
|
||||||
test: alpine320
|
test: alpine321
|
||||||
- name: Ubuntu 22.04
|
- name: Ubuntu 22.04
|
||||||
test: ubuntu2204
|
test: ubuntu2204
|
||||||
- name: Ubuntu 24.04
|
- name: Ubuntu 24.04
|
||||||
|
@ -286,6 +288,10 @@ stages:
|
||||||
parameters:
|
parameters:
|
||||||
testFormat: 2.18/linux/{0}
|
testFormat: 2.18/linux/{0}
|
||||||
targets:
|
targets:
|
||||||
|
- name: Fedora 40
|
||||||
|
test: fedora40
|
||||||
|
- name: Alpine 3.20
|
||||||
|
test: alpine320
|
||||||
- name: Ubuntu 24.04
|
- name: Ubuntu 24.04
|
||||||
test: ubuntu2404
|
test: ubuntu2404
|
||||||
groups:
|
groups:
|
||||||
|
|
|
@ -19,3 +19,4 @@ skip/rhel9.1
|
||||||
skip/rhel9.2
|
skip/rhel9.2
|
||||||
skip/rhel9.3
|
skip/rhel9.3
|
||||||
skip/rhel9.4
|
skip/rhel9.4
|
||||||
|
skip/rhel9.5
|
||||||
|
|
|
@ -19,3 +19,4 @@ skip/rhel9.1
|
||||||
skip/rhel9.2
|
skip/rhel9.2
|
||||||
skip/rhel9.3
|
skip/rhel9.3
|
||||||
skip/rhel9.4
|
skip/rhel9.4
|
||||||
|
skip/rhel9.5
|
||||||
|
|
|
@ -7,6 +7,7 @@
|
||||||
- include_tasks: install.yml
|
- include_tasks: install.yml
|
||||||
- include_tasks: lock_bash.yml
|
- include_tasks: lock_bash.yml
|
||||||
- include_tasks: lock_updates.yml
|
- include_tasks: lock_updates.yml
|
||||||
when: (ansible_distribution == 'Fedora' and ansible_distribution_major_version is version('23', '>=')) or
|
when: (ansible_distribution == 'Fedora' and ansible_distribution_major_version is version('23', '>=') and ansible_distribution_major_version is version('41', '<')) or
|
||||||
(ansible_distribution in ['RedHat', 'CentOS'] and ansible_distribution_major_version is version('8', '>='))
|
(ansible_distribution in ['RedHat', 'CentOS'] and ansible_distribution_major_version is version('8', '>='))
|
||||||
|
# TODO: Fix on Fedora 41, apparently the output changed!
|
||||||
...
|
...
|
||||||
|
|
|
@ -7,3 +7,4 @@ skip/python2.7 # jc only supports python3.x
|
||||||
skip/freebsd13.3 # FIXME - ruyaml compilation fails
|
skip/freebsd13.3 # FIXME - ruyaml compilation fails
|
||||||
skip/freebsd14.0 # FIXME - ruyaml compilation fails
|
skip/freebsd14.0 # FIXME - ruyaml compilation fails
|
||||||
skip/freebsd14.1 # FIXME - ruyaml compilation fails
|
skip/freebsd14.1 # FIXME - ruyaml compilation fails
|
||||||
|
skip/freebsd14.2 # FIXME - ruyaml compilation fails
|
||||||
|
|
|
@ -18,6 +18,7 @@
|
||||||
- files:
|
- files:
|
||||||
- '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml'
|
- '{{ ansible_distribution }}-{{ ansible_distribution_major_version }}.yml'
|
||||||
- '{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml'
|
- '{{ ansible_distribution }}-{{ ansible_distribution_version }}.yml'
|
||||||
|
- '{{ ansible_distribution }}.yml'
|
||||||
- '{{ ansible_os_family }}.yml'
|
- '{{ ansible_os_family }}.yml'
|
||||||
- 'default.yml'
|
- 'default.yml'
|
||||||
paths: '../vars'
|
paths: '../vars'
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
test_packages:
|
||||||
|
- "ruby"
|
|
@ -12,3 +12,4 @@ skip/rhel9.1 # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/
|
||||||
skip/rhel9.2 # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/
|
skip/rhel9.2 # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/
|
||||||
skip/rhel9.3 # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/
|
skip/rhel9.3 # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/
|
||||||
skip/rhel9.4 # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/
|
skip/rhel9.4 # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/
|
||||||
|
skip/rhel9.5 # See https://www.reddit.com/r/Fedora/comments/si7nzk/homectl/
|
||||||
|
|
|
@ -12,9 +12,11 @@ skip/rhel9.1 # FIXME
|
||||||
skip/rhel9.2 # FIXME
|
skip/rhel9.2 # FIXME
|
||||||
skip/rhel9.3 # FIXME
|
skip/rhel9.3 # FIXME
|
||||||
skip/rhel9.4 # FIXME
|
skip/rhel9.4 # FIXME
|
||||||
|
skip/rhel9.5 # FIXME
|
||||||
skip/freebsd12.4 # FIXME
|
skip/freebsd12.4 # FIXME
|
||||||
skip/freebsd13.2 # FIXME
|
skip/freebsd13.2 # FIXME
|
||||||
skip/freebsd13.3 # FIXME
|
skip/freebsd13.3 # FIXME
|
||||||
skip/freebsd13.4 # FIXME
|
skip/freebsd13.4 # FIXME
|
||||||
skip/freebsd14.0 # FIXME
|
skip/freebsd14.0 # FIXME
|
||||||
skip/freebsd14.1 # FIXME
|
skip/freebsd14.1 # FIXME
|
||||||
|
skip/freebsd14.2 # FIXME
|
||||||
|
|
|
@ -10,3 +10,4 @@ skip/aix
|
||||||
skip/freebsd
|
skip/freebsd
|
||||||
skip/osx
|
skip/osx
|
||||||
skip/macos
|
skip/macos
|
||||||
|
skip/alpine3.21 # TODO try to fix
|
||||||
|
|
|
@ -12,4 +12,5 @@ skip/rhel9.1
|
||||||
skip/rhel9.2
|
skip/rhel9.2
|
||||||
skip/rhel9.3
|
skip/rhel9.3
|
||||||
skip/rhel9.4
|
skip/rhel9.4
|
||||||
|
skip/rhel9.5
|
||||||
skip/freebsd
|
skip/freebsd
|
||||||
|
|
|
@ -527,12 +527,14 @@
|
||||||
# NOTE: FreeBSD 14.1 fails to update the package catalogue for unknown reasons (someone with FreeBSD
|
# NOTE: FreeBSD 14.1 fails to update the package catalogue for unknown reasons (someone with FreeBSD
|
||||||
# knowledge has to take a look)
|
# knowledge has to take a look)
|
||||||
#
|
#
|
||||||
|
# NOTE: FreeBSD 14.2 fails as well (someone with FreeBSD knowledge has to take a look)
|
||||||
|
#
|
||||||
# See also
|
# See also
|
||||||
# https://github.com/ansible-collections/community.general/issues/5795
|
# https://github.com/ansible-collections/community.general/issues/5795
|
||||||
when: >-
|
when: >-
|
||||||
(ansible_distribution_version is version('12.01', '>=') and ansible_distribution_version is version('12.3', '<'))
|
(ansible_distribution_version is version('12.01', '>=') and ansible_distribution_version is version('12.3', '<'))
|
||||||
or (ansible_distribution_version is version('13.5', '>=') and ansible_distribution_version is version('14.0', '<'))
|
or (ansible_distribution_version is version('13.5', '>=') and ansible_distribution_version is version('14.0', '<'))
|
||||||
or ansible_distribution_version is version('14.2', '>=')
|
or ansible_distribution_version is version('14.3', '>=')
|
||||||
block:
|
block:
|
||||||
- name: Setup testjail
|
- name: Setup testjail
|
||||||
include_tasks: setup-testjail.yml
|
include_tasks: setup-testjail.yml
|
||||||
|
|
|
@ -22,13 +22,23 @@ redis_packages:
|
||||||
FreeBSD:
|
FreeBSD:
|
||||||
- redis
|
- redis
|
||||||
|
|
||||||
|
redis_user:
|
||||||
|
Alpine: redis
|
||||||
|
Archlinux: redis
|
||||||
|
Debian: redis
|
||||||
|
Ubuntu: redis
|
||||||
|
openSUSE Leap: redis
|
||||||
|
Fedora: "{{ '998' if ansible_distribution_major_version is version('41', '>=') else 'redis' }}"
|
||||||
|
CentOS: redis
|
||||||
|
FreeBSD: redis
|
||||||
|
|
||||||
redis_bin:
|
redis_bin:
|
||||||
Alpine: /usr/bin/redis-server
|
Alpine: /usr/bin/redis-server
|
||||||
Archlinux: /usr/bin/redis-server
|
Archlinux: /usr/bin/redis-server
|
||||||
Debian: /usr/bin/redis-server
|
Debian: /usr/bin/redis-server
|
||||||
Ubuntu: /usr/bin/redis-server
|
Ubuntu: /usr/bin/redis-server
|
||||||
openSUSE Leap: /usr/sbin/redis-server
|
openSUSE Leap: /usr/sbin/redis-server
|
||||||
Fedora: /usr/bin/redis-server
|
Fedora: "/usr/bin/{{ 'valkey-server' if ansible_distribution_major_version is version('41', '>=') else 'redis-server' }}"
|
||||||
CentOS: /usr/bin/redis-server
|
CentOS: /usr/bin/redis-server
|
||||||
FreeBSD: /usr/local/bin/redis-server
|
FreeBSD: /usr/local/bin/redis-server
|
||||||
|
|
||||||
|
|
|
@ -24,8 +24,8 @@
|
||||||
file:
|
file:
|
||||||
path: "{{ item }}"
|
path: "{{ item }}"
|
||||||
state: directory
|
state: directory
|
||||||
owner: redis
|
owner: "{{ redis_user[ansible_distribution] }}"
|
||||||
group: redis
|
group: "{{ redis_user[ansible_distribution] }}"
|
||||||
loop:
|
loop:
|
||||||
- "{{ master_datadir }}"
|
- "{{ master_datadir }}"
|
||||||
- "{{ master_logdir }}"
|
- "{{ master_logdir }}"
|
||||||
|
@ -54,10 +54,10 @@
|
||||||
datadir: "{{ replica_datadir }}"
|
datadir: "{{ replica_datadir }}"
|
||||||
|
|
||||||
- name: Start redis master
|
- name: Start redis master
|
||||||
shell: "{{ redis_bin[ansible_distribution] }} {{ master_conf }}"
|
ansible.builtin.command: "{{ redis_bin[ansible_distribution] }} {{ master_conf }}"
|
||||||
|
|
||||||
- name: Start redis replica
|
- name: Start redis replica
|
||||||
shell: "{{ redis_bin[ansible_distribution] }} {{ replica_conf }} --{% if old_redis %}slaveof{% else %}replicaof{% endif %} 127.0.0.1 {{ master_port }}"
|
ansible.builtin.command: "{{ redis_bin[ansible_distribution] }} {{ replica_conf }} --{% if old_redis %}slaveof{% else %}replicaof{% endif %} 127.0.0.1 {{ master_port }}"
|
||||||
|
|
||||||
- name: Wait for redis master to be started
|
- name: Wait for redis master to be started
|
||||||
ansible.builtin.wait_for:
|
ansible.builtin.wait_for:
|
||||||
|
|
|
@ -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
|
||||||
|
|
||||||
|
# Do nothing
|
|
@ -14,6 +14,7 @@ skip/rhel9.1 # FIXME
|
||||||
skip/rhel9.2 # FIXME
|
skip/rhel9.2 # FIXME
|
||||||
skip/rhel9.3 # FIXME
|
skip/rhel9.3 # FIXME
|
||||||
skip/rhel9.4 # FIXME
|
skip/rhel9.4 # FIXME
|
||||||
|
skip/rhel9.5 # FIXME
|
||||||
skip/docker
|
skip/docker
|
||||||
needs/root
|
needs/root
|
||||||
needs/target/setup_epel
|
needs/target/setup_epel
|
||||||
|
|
Loading…
Reference in New Issue