Skip to content

Commit 5e60bee

Browse files
authored
Adjust CI matrix for ansible-core devel's ansible-test (#771)
* Adjust CI matrix for ansible-core devel's ansible-test. * Don't install cryptography via pip on Ubuntu 24.04. * Don't force-enable on Fedora.
1 parent 33410b1 commit 5e60bee

File tree

3 files changed

+25
-13
lines changed

3 files changed

+25
-13
lines changed

.azure-pipelines/azure-pipelines.yml

Lines changed: 20 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -107,12 +107,12 @@ stages:
107107
parameters:
108108
testFormat: devel/linux/{0}
109109
targets:
110-
- name: Fedora 39
111-
test: fedora39
112-
- name: Ubuntu 22.04
113-
test: ubuntu2204
114-
- name: Alpine 3.19
115-
test: alpine319
110+
- name: Fedora 40
111+
test: fedora40
112+
- name: Ubuntu 24.04
113+
test: ubuntu2404
114+
- name: Alpine 3.20
115+
test: alpine320
116116
groups:
117117
- 1
118118
- 2
@@ -124,6 +124,10 @@ stages:
124124
parameters:
125125
testFormat: 2.17/linux/{0}
126126
targets:
127+
- name: Fedora 39
128+
test: fedora39
129+
- name: Ubuntu 22.04
130+
test: ubuntu2204
127131
- name: Alpine 3.19
128132
test: alpine319
129133
groups:
@@ -190,12 +194,14 @@ stages:
190194
parameters:
191195
testFormat: devel/{0}
192196
targets:
193-
- name: Alpine 3.19
194-
test: alpine/3.19
195-
- name: Fedora 39
196-
test: fedora/39
197+
- name: Alpine 3.20
198+
test: alpine/3.20
199+
- name: Fedora 40
200+
test: fedora/40
197201
- name: Ubuntu 22.04
198202
test: ubuntu/22.04
203+
- name: Ubuntu 24.04
204+
test: ubuntu/24.04
199205
groups:
200206
- vm
201207
- stage: Remote_devel
@@ -208,8 +214,8 @@ stages:
208214
targets:
209215
- name: macOS 14.3
210216
test: macos/14.3
211-
- name: RHEL 9.3
212-
test: rhel/9.3
217+
- name: RHEL 9.4
218+
test: rhel/9.4
213219
- name: FreeBSD 14.0
214220
test: freebsd/14.0
215221
groups:
@@ -223,6 +229,8 @@ stages:
223229
parameters:
224230
testFormat: 2.17/{0}
225231
targets:
232+
- name: RHEL 9.3
233+
test: rhel/9.3
226234
- name: FreeBSD 13.3
227235
test: freebsd/13.3
228236
groups:

tests/integration/targets/prepare_http_tests/tasks/default.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55

66
- name: RedHat - Enable the dynamic CA configuration feature
77
command: update-ca-trust force-enable
8-
when: ansible_os_family == 'RedHat'
8+
when: ansible_os_family == 'RedHat' and ansible_distribution != "Fedora"
99

1010
- name: RedHat - Retrieve test cacert
1111
get_url:

tests/integration/targets/setup_python_info/vars/main.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,8 @@ system_python_version_data:
3535
- '3.8'
3636
'22':
3737
- '3.10'
38+
'24':
39+
- '3.12'
3840
Darwin:
3941
'10.11':
4042
- '2.7'
@@ -91,3 +93,5 @@ cannot_upgrade_cryptography:
9193
Ubuntu:
9294
'18':
9395
- '3.9' # this is the default container for ansible-core 2.12; upgrading cryptography wrecks pyOpenSSL
96+
'24':
97+
- '3.12' # ERROR: Cannot uninstall cryptography 41.0.7, RECORD file not found. Hint: The package was installed by debian.

0 commit comments

Comments
 (0)