CI: Add Fedora 41, Alpine 3.21, RHEL 9.5, FreeBSD 14.2 to CI for devel (#834)
* Add Fedora 41, Alpine 3.21, RHEL 9.5, FreeBSD 14.2 to CI for devel. * Fedora 41 also doesn't allow SHA-1 apparently. Ref: https://fedoraproject.org/wiki/Changes/OpenSSLDistrustSHA1SigVer * Work around broken cryptography in Fedora 41.pull/835/head
parent
cfd524f345
commit
029e009db1
|
@ -118,12 +118,12 @@ stages:
|
||||||
parameters:
|
parameters:
|
||||||
testFormat: devel/linux/{0}
|
testFormat: devel/linux/{0}
|
||||||
targets:
|
targets:
|
||||||
- name: Fedora 40
|
- name: Fedora 41
|
||||||
test: fedora40
|
test: fedora41
|
||||||
- name: Ubuntu 24.04
|
- name: Ubuntu 24.04
|
||||||
test: ubuntu2404
|
test: ubuntu2404
|
||||||
- name: Alpine 3.20
|
- name: Alpine 3.21
|
||||||
test: alpine320
|
test: alpine321
|
||||||
groups:
|
groups:
|
||||||
- 1
|
- 1
|
||||||
- 2
|
- 2
|
||||||
|
@ -135,8 +135,12 @@ stages:
|
||||||
parameters:
|
parameters:
|
||||||
testFormat: 2.18/linux/{0}
|
testFormat: 2.18/linux/{0}
|
||||||
targets:
|
targets:
|
||||||
|
- name: Fedora 40
|
||||||
|
test: fedora40
|
||||||
- name: Ubuntu 24.04
|
- name: Ubuntu 24.04
|
||||||
test: ubuntu2404
|
test: ubuntu2404
|
||||||
|
- name: Alpine 3.20
|
||||||
|
test: alpine320
|
||||||
groups:
|
groups:
|
||||||
- 1
|
- 1
|
||||||
- 2
|
- 2
|
||||||
|
@ -218,10 +222,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
|
||||||
|
@ -238,10 +242,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:
|
||||||
|
@ -257,6 +261,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
|
||||||
|
|
|
@ -0,0 +1,5 @@
|
||||||
|
bugfixes:
|
||||||
|
- "crypto_info - when running the module on Fedora 41 with ``cryptography`` installed from the package repository,
|
||||||
|
the module crashed apparently due to some elliptic curves being removed from libssl against which cryptography
|
||||||
|
is running, which cryptography did not expect
|
||||||
|
(https://github.com/ansible-collections/community.crypto/pull/834)."
|
|
@ -177,8 +177,16 @@ from ansible_collections.community.crypto.plugins.module_utils.crypto.basic impo
|
||||||
try:
|
try:
|
||||||
import cryptography
|
import cryptography
|
||||||
from cryptography.exceptions import UnsupportedAlgorithm
|
from cryptography.exceptions import UnsupportedAlgorithm
|
||||||
|
|
||||||
|
try:
|
||||||
|
# While UnsupportedAlgorithm got added in cryptography 0.1, InternalError
|
||||||
|
# only got added in 0.2, so let's guard the import
|
||||||
|
from cryptography.exceptions import InternalError as CryptographyInternalError
|
||||||
|
except ImportError:
|
||||||
|
CryptographyInternalError = Exception
|
||||||
except ImportError:
|
except ImportError:
|
||||||
UnsupportedAlgorithm = Exception
|
UnsupportedAlgorithm = Exception
|
||||||
|
CryptographyInternalError = Exception
|
||||||
CRYPTOGRAPHY_VERSION = None
|
CRYPTOGRAPHY_VERSION = None
|
||||||
CRYPTOGRAPHY_IMP_ERR = traceback.format_exc()
|
CRYPTOGRAPHY_IMP_ERR = traceback.format_exc()
|
||||||
else:
|
else:
|
||||||
|
@ -274,6 +282,11 @@ def add_crypto_information(module):
|
||||||
curves.append(curve_name)
|
curves.append(curve_name)
|
||||||
except UnsupportedAlgorithm:
|
except UnsupportedAlgorithm:
|
||||||
pass
|
pass
|
||||||
|
except CryptographyInternalError: # pylint: disable=duplicate-except,bad-except-order
|
||||||
|
# On Fedora 41, some curves result in InternalError. This is probably because
|
||||||
|
# Fedora's cryptography is linked against the system libssl, which has the
|
||||||
|
# curves removed.
|
||||||
|
pass
|
||||||
|
|
||||||
info = {
|
info = {
|
||||||
'version': CRYPTOGRAPHY_VERSION,
|
'version': CRYPTOGRAPHY_VERSION,
|
||||||
|
|
|
@ -74,9 +74,11 @@
|
||||||
assert:
|
assert:
|
||||||
that:
|
that:
|
||||||
- second_signature_algorithm is changed
|
- second_signature_algorithm is changed
|
||||||
# RHEL9 disables SHA-1 algorithms by default making this test fail with a 'libcrypt' error. Other systems which
|
# RHEL9 and Fedora 41 disable the SHA-1 algorithms by default, making this test fail with a 'libcrypt' error.
|
||||||
# impose a similar restriction may also need to skip this block in the future.
|
# Other systems which impose a similar restriction may also need to skip this block in the future.
|
||||||
when: not (ansible_facts['distribution'] == "RedHat" and (ansible_facts['distribution_major_version'] | int) >= 9)
|
when:
|
||||||
|
- not (ansible_facts['distribution'] == "RedHat" and (ansible_facts['distribution_major_version'] | int) >= 9)
|
||||||
|
- not (ansible_facts['distribution'] == "Fedora" and (ansible_facts['distribution_major_version'] | int) >= 41)
|
||||||
|
|
||||||
- name: Omit signature algorithm
|
- name: Omit signature algorithm
|
||||||
openssh_cert:
|
openssh_cert:
|
||||||
|
|
Loading…
Reference in New Issue