Skip to content

Commit 96364a4

Browse files
committed
test: skip initscript related tests on Fedora 41 and later
Support for network-scripts has been removed from Fedora 41 https://discussion.fedoraproject.org/t/f41-change-proposal-removing-network-scripts-package-system-wide/118553 Skip the tests because they fail. Signed-off-by: Rich Megginson <rmeggins@redhat.com>
1 parent f75b203 commit 96364a4

File tree

3 files changed

+13
-5
lines changed

3 files changed

+13
-5
lines changed

tests/ensure_provider_tests.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,12 @@
8484
"playbooks/tests_provider.yml": {
8585
MINIMUM_VERSION: "'1.20.0'",
8686
"comment": "# NetworKmanager 1.20.0 added support for forgetting profiles",
87-
EXTRA_RUN_CONDITION: "ansible_distribution not in ['RedHat', 'CentOS'] or\n ansible_distr\
88-
ibution_major_version | int < 9",
87+
EXTRA_RUN_CONDITION: (
88+
"(ansible_distribution == 'Fedora'\n"
89+
" and ansible_distribution_major_version | int < 41)\n"
90+
" or ansible_distribution not in ['RedHat', 'CentOS', 'Fedora']\n"
91+
" or ansible_distribution_major_version | int < 9"
92+
),
8993
},
9094
"playbooks/tests_eth_pci_address_match.yml": {
9195
MINIMUM_VERSION: "'1.26.0'",

tests/tests_provider_nm.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,5 +43,7 @@
4343
- ansible_distribution_major_version != '6'
4444

4545
- networkmanager_version is version('1.20.0', '>=')
46-
- ansible_distribution not in ['RedHat', 'CentOS'] or
47-
ansible_distribution_major_version | int < 9
46+
- (ansible_distribution == 'Fedora'
47+
and ansible_distribution_major_version | int < 41)
48+
or ansible_distribution not in ['RedHat', 'CentOS', 'Fedora']
49+
or ansible_distribution_major_version | int < 9

tests/tests_regression_nm.yml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,5 +35,7 @@
3535
- ansible_distribution_major_version != '6'
3636
# The test depends on behavior that is only visible with newer NM
3737
- networkmanager_version is version('1.22.0', '>=')
38-
- ansible_distribution not in ['RedHat', 'CentOS'] or
38+
- ansible_distribution not in ['RedHat', 'CentOS', 'Fedora'] or
39+
(ansible_distribution == 'Fedora' and
40+
ansible_distribution_major_version | int < 41) or
3941
ansible_distribution_major_version | int < 9

0 commit comments

Comments
 (0)