From fde69e0758d20659bcd9396debbae353055bf750 Mon Sep 17 00:00:00 2001 From: Wen Liang Date: Fri, 11 Feb 2022 13:03:25 -0500 Subject: [PATCH] Disable all initscripts provider tests on Fedora The initscripts provider tests are unstable on Fedora and users are not using the initscripts on Fedora, therefore, disable all initscripts provider tests on Fedora. Signed-off-by: Wen Liang --- tests/ensure_provider_tests.py | 3 +-- tests/tests_auto_gateway_initscripts.yml | 3 +-- tests/tests_bond_deprecated_initscripts.yml | 3 +-- tests/tests_bond_initscripts.yml | 3 +-- tests/tests_bridge_initscripts.yml | 3 +-- tests/tests_default_initscripts.yml | 3 +-- tests/tests_ethernet_initscripts.yml | 3 +-- tests/tests_ethtool_coalesce_initscripts.yml | 3 +-- tests/tests_ethtool_features_initscripts.yml | 3 +-- tests/tests_ethtool_ring_initscripts.yml | 3 +-- tests/tests_ipv6_initscripts.yml | 3 +-- tests/tests_states_initscripts.yml | 3 +-- tests/tests_switch_provider.yml | 1 - tests/tests_vlan_mtu_initscripts.yml | 3 +-- 14 files changed, 13 insertions(+), 27 deletions(-) diff --git a/tests/ensure_provider_tests.py b/tests/ensure_provider_tests.py index 02844e9..6f9b331 100755 --- a/tests/ensure_provider_tests.py +++ b/tests/ensure_provider_tests.py @@ -150,8 +150,7 @@ RUN_PLAYBOOK_WITH_INITSCRIPTS = """# SPDX-License-Identifier: BSD-3-Clause - import_playbook: {test_playbook} when: (ansible_distribution in ['CentOS','RedHat'] and\n \ -ansible_distribution_major_version | int < 9) or\n \ -ansible_distribution == 'Fedora' +ansible_distribution_major_version | int < 9) """ diff --git a/tests/tests_auto_gateway_initscripts.yml b/tests/tests_auto_gateway_initscripts.yml index 3cb2fdc..e570ba1 100644 --- a/tests/tests_auto_gateway_initscripts.yml +++ b/tests/tests_auto_gateway_initscripts.yml @@ -13,5 +13,4 @@ - import_playbook: playbooks/tests_auto_gateway.yml when: (ansible_distribution in ['CentOS','RedHat'] and - ansible_distribution_major_version | int < 9) or - ansible_distribution == 'Fedora' + ansible_distribution_major_version | int < 9) diff --git a/tests/tests_bond_deprecated_initscripts.yml b/tests/tests_bond_deprecated_initscripts.yml index d1e0ec1..8d37534 100644 --- a/tests/tests_bond_deprecated_initscripts.yml +++ b/tests/tests_bond_deprecated_initscripts.yml @@ -13,5 +13,4 @@ - import_playbook: playbooks/tests_bond_deprecated.yml when: (ansible_distribution in ['CentOS','RedHat'] and - ansible_distribution_major_version | int < 9) or - ansible_distribution == 'Fedora' + ansible_distribution_major_version | int < 9) diff --git a/tests/tests_bond_initscripts.yml b/tests/tests_bond_initscripts.yml index 29f3419..833d564 100644 --- a/tests/tests_bond_initscripts.yml +++ b/tests/tests_bond_initscripts.yml @@ -13,5 +13,4 @@ - import_playbook: playbooks/tests_bond.yml when: (ansible_distribution in ['CentOS','RedHat'] and - ansible_distribution_major_version | int < 9) or - ansible_distribution == 'Fedora' + ansible_distribution_major_version | int < 9) diff --git a/tests/tests_bridge_initscripts.yml b/tests/tests_bridge_initscripts.yml index 4e8a52f..3f0395a 100644 --- a/tests/tests_bridge_initscripts.yml +++ b/tests/tests_bridge_initscripts.yml @@ -13,5 +13,4 @@ - import_playbook: playbooks/tests_bridge.yml when: (ansible_distribution in ['CentOS','RedHat'] and - ansible_distribution_major_version | int < 9) or - ansible_distribution == 'Fedora' + ansible_distribution_major_version | int < 9) diff --git a/tests/tests_default_initscripts.yml b/tests/tests_default_initscripts.yml index 6e983bc..9a51287 100644 --- a/tests/tests_default_initscripts.yml +++ b/tests/tests_default_initscripts.yml @@ -9,5 +9,4 @@ - import_playbook: tests_default.yml when: (ansible_distribution in ['CentOS','RedHat'] and - ansible_distribution_major_version | int < 9) or - ansible_distribution == 'Fedora' + ansible_distribution_major_version | int < 9) diff --git a/tests/tests_ethernet_initscripts.yml b/tests/tests_ethernet_initscripts.yml index 17974c3..cd3cff1 100644 --- a/tests/tests_ethernet_initscripts.yml +++ b/tests/tests_ethernet_initscripts.yml @@ -13,5 +13,4 @@ - import_playbook: playbooks/tests_ethernet.yml when: (ansible_distribution in ['CentOS','RedHat'] and - ansible_distribution_major_version | int < 9) or - ansible_distribution == 'Fedora' + ansible_distribution_major_version | int < 9) diff --git a/tests/tests_ethtool_coalesce_initscripts.yml b/tests/tests_ethtool_coalesce_initscripts.yml index 1798780..98b1eb4 100644 --- a/tests/tests_ethtool_coalesce_initscripts.yml +++ b/tests/tests_ethtool_coalesce_initscripts.yml @@ -13,5 +13,4 @@ - import_playbook: playbooks/tests_ethtool_coalesce.yml when: (ansible_distribution in ['CentOS','RedHat'] and - ansible_distribution_major_version | int < 9) or - ansible_distribution == 'Fedora' + ansible_distribution_major_version | int < 9) diff --git a/tests/tests_ethtool_features_initscripts.yml b/tests/tests_ethtool_features_initscripts.yml index 5a3f334..89c3e15 100644 --- a/tests/tests_ethtool_features_initscripts.yml +++ b/tests/tests_ethtool_features_initscripts.yml @@ -13,5 +13,4 @@ - import_playbook: playbooks/tests_ethtool_features.yml when: (ansible_distribution in ['CentOS','RedHat'] and - ansible_distribution_major_version | int < 9) or - ansible_distribution == 'Fedora' + ansible_distribution_major_version | int < 9) diff --git a/tests/tests_ethtool_ring_initscripts.yml b/tests/tests_ethtool_ring_initscripts.yml index aaa0545..0fe0164 100644 --- a/tests/tests_ethtool_ring_initscripts.yml +++ b/tests/tests_ethtool_ring_initscripts.yml @@ -13,5 +13,4 @@ - import_playbook: playbooks/tests_ethtool_ring.yml when: (ansible_distribution in ['CentOS','RedHat'] and - ansible_distribution_major_version | int < 9) or - ansible_distribution == 'Fedora' + ansible_distribution_major_version | int < 9) diff --git a/tests/tests_ipv6_initscripts.yml b/tests/tests_ipv6_initscripts.yml index d017783..5e95ee4 100644 --- a/tests/tests_ipv6_initscripts.yml +++ b/tests/tests_ipv6_initscripts.yml @@ -13,5 +13,4 @@ - import_playbook: playbooks/tests_ipv6.yml when: (ansible_distribution in ['CentOS','RedHat'] and - ansible_distribution_major_version | int < 9) or - ansible_distribution == 'Fedora' + ansible_distribution_major_version | int < 9) diff --git a/tests/tests_states_initscripts.yml b/tests/tests_states_initscripts.yml index efc7abe..8cdd964 100644 --- a/tests/tests_states_initscripts.yml +++ b/tests/tests_states_initscripts.yml @@ -13,5 +13,4 @@ - import_playbook: playbooks/tests_states.yml when: (ansible_distribution in ['CentOS','RedHat'] and - ansible_distribution_major_version | int < 9) or - ansible_distribution == 'Fedora' + ansible_distribution_major_version | int < 9) diff --git a/tests/tests_switch_provider.yml b/tests/tests_switch_provider.yml index 75afbac..9a76272 100644 --- a/tests/tests_switch_provider.yml +++ b/tests/tests_switch_provider.yml @@ -9,4 +9,3 @@ # run on RHEL/CentOS 7, RHEL/CentOS 8, or Fedora - ansible_distribution in ['CentOS', 'RedHat'] and ansible_distribution_major_version in ['7', '8'] - or ansible_distribution == 'Fedora' diff --git a/tests/tests_vlan_mtu_initscripts.yml b/tests/tests_vlan_mtu_initscripts.yml index 7ee38dd..c7e78f4 100644 --- a/tests/tests_vlan_mtu_initscripts.yml +++ b/tests/tests_vlan_mtu_initscripts.yml @@ -13,5 +13,4 @@ - import_playbook: playbooks/tests_vlan_mtu.yml when: (ansible_distribution in ['CentOS','RedHat'] and - ansible_distribution_major_version | int < 9) or - ansible_distribution == 'Fedora' + ansible_distribution_major_version | int < 9)