From 88189e32ab6ab4491430584e8c162c9c42d6ca47 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Thu, 25 Mar 2021 13:55:01 -0600 Subject: [PATCH 1/4] Patch51: network-epel-minimal.diff --- .../playbooks/integration_pytest_python3.yml | 5 ++++ tests/tasks/el_repo_setup.yml | 26 ------------------- tests/tasks/setup_802_1x_server.yml | 2 ++ tests/tasks/setup_mock_wifi.yml | 2 ++ tests/tests_802_1x_nm.yml | 1 - tests/tests_802_1x_updated_nm.yml | 1 - tests/tests_bond_deprecated_initscripts.yml | 1 - tests/tests_bond_initscripts.yml | 1 - tests/tests_bond_nm.yml | 1 - tests/tests_bridge_initscripts.yml | 1 - tests/tests_bridge_nm.yml | 1 - tests/tests_default.yml | 1 - tests/tests_default_initscripts.yml | 1 - tests/tests_default_nm.yml | 1 - tests/tests_ethernet_initscripts.yml | 2 -- tests/tests_ethernet_nm.yml | 2 -- tests/tests_ethtool_features_initscripts.yml | 1 - tests/tests_ethtool_features_nm.yml | 2 -- tests/tests_helpers_and_asserts.yml | 2 -- tests/tests_integration_pytest.yml | 5 ++-- tests/tests_provider_nm.yml | 2 -- tests/tests_reapply_nm.yml | 2 -- tests/tests_regression_nm.yml | 2 -- tests/tests_states_initscripts.yml | 2 -- tests/tests_states_nm.yml | 2 -- tests/tests_team_nm.yml | 2 -- tests/tests_unit.yml | 2 +- tests/tests_vlan_mtu_initscripts.yml | 2 -- tests/tests_vlan_mtu_nm.yml | 2 -- tests/tests_wireless_nm.yml | 2 -- 30 files changed, 12 insertions(+), 67 deletions(-) delete mode 100644 tests/tasks/el_repo_setup.yml diff --git a/tests/playbooks/integration_pytest_python3.yml b/tests/playbooks/integration_pytest_python3.yml index 075355b..5fc9dea 100644 --- a/tests/playbooks/integration_pytest_python3.yml +++ b/tests/playbooks/integration_pytest_python3.yml @@ -9,6 +9,11 @@ - rsync tasks: + - name: Install EPEL for RHEL and CentOS + # yamllint disable-line rule:line-length + command: "yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-8.noarch.rpm" + when: ansible_distribution in ["CentOS", "RedHat"] + - name: Install rpm dependencies package: state: present diff --git a/tests/tasks/el_repo_setup.yml b/tests/tasks/el_repo_setup.yml deleted file mode 100644 index 0656e8c..0000000 --- a/tests/tasks/el_repo_setup.yml +++ /dev/null @@ -1,26 +0,0 @@ -# SPDX-License-Identifier: BSD-3-Clause -- name: Fix CentOS6 Base repo - copy: - dest: /etc/yum.repos.d/CentOS-Base.repo - content: | - [base] - name=CentOS-$releasever - Base - baseurl=https://vault.centos.org/6.10/os/$basearch/ - gpgcheck=1 - gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 - - [updates] - name=CentOS-$releasever - Updates - baseurl=https://vault.centos.org/6.10/updates/$basearch/ - gpgcheck=1 - gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 - - [extras] - name=CentOS-$releasever - Extras - baseurl=https://vault.centos.org/6.10/extras/$basearch/ - gpgcheck=1 - gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-CentOS-6 - when: - - ansible_distribution == 'CentOS' - - ansible_distribution_major_version == '6' -- include_tasks: enable_epel.yml diff --git a/tests/tasks/setup_802_1x_server.yml b/tests/tasks/setup_802_1x_server.yml index 49d1ce1..3bf16a9 100644 --- a/tests/tasks/setup_802_1x_server.yml +++ b/tests/tasks/setup_802_1x_server.yml @@ -1,5 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause --- +- include_tasks: enable_epel.yml + - name: Install hostapd package: name: hostapd diff --git a/tests/tasks/setup_mock_wifi.yml b/tests/tasks/setup_mock_wifi.yml index 997b704..d7a1e22 100644 --- a/tests/tasks/setup_mock_wifi.yml +++ b/tests/tasks/setup_mock_wifi.yml @@ -1,5 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause --- +- include_tasks: enable_epel.yml + - name: Install packages required to set up mock wifi network package: name: diff --git a/tests/tests_802_1x_nm.yml b/tests/tests_802_1x_nm.yml index a27d8ea..288cd5d 100644 --- a/tests/tests_802_1x_nm.yml +++ b/tests/tests_802_1x_nm.yml @@ -5,7 +5,6 @@ - hosts: all name: Run playbook 'playbooks/tests_802_1x.yml' with nm as provider tasks: - - include_tasks: tasks/el_repo_setup.yml - name: Set network provider to 'nm' set_fact: network_provider: nm diff --git a/tests/tests_802_1x_updated_nm.yml b/tests/tests_802_1x_updated_nm.yml index 5a25f5b..bd335e4 100644 --- a/tests/tests_802_1x_updated_nm.yml +++ b/tests/tests_802_1x_updated_nm.yml @@ -5,7 +5,6 @@ - hosts: all name: Run playbook 'playbooks/tests_802_1x_updated.yml' with nm as provider tasks: - - include_tasks: tasks/el_repo_setup.yml - name: Set network provider to 'nm' set_fact: network_provider: nm diff --git a/tests/tests_bond_deprecated_initscripts.yml b/tests/tests_bond_deprecated_initscripts.yml index 1e74bcc..383b488 100644 --- a/tests/tests_bond_deprecated_initscripts.yml +++ b/tests/tests_bond_deprecated_initscripts.yml @@ -4,7 +4,6 @@ - hosts: all name: Run playbook 'playbooks/tests_bond_deprecated.yml' with initscripts tasks: - - include_tasks: tasks/el_repo_setup.yml - name: Set network provider to 'initscripts' set_fact: network_provider: initscripts diff --git a/tests/tests_bond_initscripts.yml b/tests/tests_bond_initscripts.yml index 32fcc32..8fa74c5 100644 --- a/tests/tests_bond_initscripts.yml +++ b/tests/tests_bond_initscripts.yml @@ -4,7 +4,6 @@ - hosts: all name: Run playbook 'playbooks/tests_bond.yml' with initscripts as provider tasks: - - include_tasks: tasks/el_repo_setup.yml - name: Set network provider to 'initscripts' set_fact: network_provider: initscripts diff --git a/tests/tests_bond_nm.yml b/tests/tests_bond_nm.yml index 7075d95..8ac6cbd 100644 --- a/tests/tests_bond_nm.yml +++ b/tests/tests_bond_nm.yml @@ -5,7 +5,6 @@ - hosts: all name: Run playbook 'playbooks/tests_bond.yml' with nm as provider tasks: - - include_tasks: tasks/el_repo_setup.yml - name: Set network provider to 'nm' set_fact: network_provider: nm diff --git a/tests/tests_bridge_initscripts.yml b/tests/tests_bridge_initscripts.yml index 8ce42e6..db5663c 100644 --- a/tests/tests_bridge_initscripts.yml +++ b/tests/tests_bridge_initscripts.yml @@ -4,7 +4,6 @@ - hosts: all name: Run playbook 'playbooks/tests_bridge.yml' with initscripts as provider tasks: - - include_tasks: tasks/el_repo_setup.yml - name: Set network provider to 'initscripts' set_fact: network_provider: initscripts diff --git a/tests/tests_bridge_nm.yml b/tests/tests_bridge_nm.yml index 3d1b53a..c565952 100644 --- a/tests/tests_bridge_nm.yml +++ b/tests/tests_bridge_nm.yml @@ -5,7 +5,6 @@ - hosts: all name: Run playbook 'playbooks/tests_bridge.yml' with nm as provider tasks: - - include_tasks: tasks/el_repo_setup.yml - name: Set network provider to 'nm' set_fact: network_provider: nm diff --git a/tests/tests_default.yml b/tests/tests_default.yml index e196314..f6f7550 100644 --- a/tests/tests_default.yml +++ b/tests/tests_default.yml @@ -5,7 +5,6 @@ roles: - linux-system-roles.network tasks: - - include_tasks: tasks/el_repo_setup.yml - name: Test warning and info logs assert: that: diff --git a/tests/tests_default_initscripts.yml b/tests/tests_default_initscripts.yml index 006889c..cc8b875 100644 --- a/tests/tests_default_initscripts.yml +++ b/tests/tests_default_initscripts.yml @@ -2,7 +2,6 @@ --- - hosts: all tasks: - - include_tasks: tasks/el_repo_setup.yml - name: Set network provider to 'initscripts' set_fact: network_provider: initscripts diff --git a/tests/tests_default_nm.yml b/tests/tests_default_nm.yml index 54bc3e1..8138ca9 100644 --- a/tests/tests_default_nm.yml +++ b/tests/tests_default_nm.yml @@ -2,7 +2,6 @@ --- - hosts: all tasks: - - include_tasks: tasks/el_repo_setup.yml - name: Set network provider to 'nm' set_fact: network_provider: nm diff --git a/tests/tests_ethernet_initscripts.yml b/tests/tests_ethernet_initscripts.yml index 366b052..62e75fe 100644 --- a/tests/tests_ethernet_initscripts.yml +++ b/tests/tests_ethernet_initscripts.yml @@ -4,8 +4,6 @@ - hosts: all name: Run playbook 'playbooks/tests_ethernet.yml' with initscripts as provider tasks: - - include_tasks: tasks/el_repo_setup.yml - - name: Set network provider to 'initscripts' set_fact: network_provider: initscripts diff --git a/tests/tests_ethernet_nm.yml b/tests/tests_ethernet_nm.yml index 238172d..ecefa14 100644 --- a/tests/tests_ethernet_nm.yml +++ b/tests/tests_ethernet_nm.yml @@ -5,8 +5,6 @@ - hosts: all name: Run playbook 'playbooks/tests_ethernet.yml' with nm as provider tasks: - - include_tasks: tasks/el_repo_setup.yml - - name: Set network provider to 'nm' set_fact: network_provider: nm diff --git a/tests/tests_ethtool_features_initscripts.yml b/tests/tests_ethtool_features_initscripts.yml index 5bac5d3..6aea73b 100644 --- a/tests/tests_ethtool_features_initscripts.yml +++ b/tests/tests_ethtool_features_initscripts.yml @@ -2,7 +2,6 @@ # set network provider and gather facts - hosts: all tasks: - - include_tasks: tasks/el_repo_setup.yml - name: Set network provider to 'initscripts' set_fact: network_provider: initscripts diff --git a/tests/tests_ethtool_features_nm.yml b/tests/tests_ethtool_features_nm.yml index 2027862..30c6faa 100644 --- a/tests/tests_ethtool_features_nm.yml +++ b/tests/tests_ethtool_features_nm.yml @@ -5,8 +5,6 @@ - hosts: all name: Run playbook 'playbooks/tests_ethtool_features.yml' with nm as provider tasks: - - include_tasks: tasks/el_repo_setup.yml - - name: Set network provider to 'nm' set_fact: network_provider: nm diff --git a/tests/tests_helpers_and_asserts.yml b/tests/tests_helpers_and_asserts.yml index 64e2875..5514182 100644 --- a/tests/tests_helpers_and_asserts.yml +++ b/tests/tests_helpers_and_asserts.yml @@ -3,8 +3,6 @@ - name: Check that creating and removing test devices and assertions work hosts: all tasks: - - include_tasks: tasks/el_repo_setup.yml - - name: test veth interface management include_tasks: tasks/create_and_remove_interface.yml vars: diff --git a/tests/tests_integration_pytest.yml b/tests/tests_integration_pytest.yml index 9b80bd4..153214d 100644 --- a/tests/tests_integration_pytest.yml +++ b/tests/tests_integration_pytest.yml @@ -1,8 +1,7 @@ # SPDX-License-Identifier: BSD-3-Clause --- -- hosts: all - tasks: - - include_tasks: tasks/el_repo_setup.yml +- name: Empty play to gather facts + hosts: all - import_playbook: playbooks/integration_pytest_python3.yml when: (ansible_distribution in ["CentOS", "RedHat"] and diff --git a/tests/tests_provider_nm.yml b/tests/tests_provider_nm.yml index 67fcffe..99306a1 100644 --- a/tests/tests_provider_nm.yml +++ b/tests/tests_provider_nm.yml @@ -5,8 +5,6 @@ - hosts: all name: Run playbook 'playbooks/tests_provider.yml' with nm as provider tasks: - - include_tasks: tasks/el_repo_setup.yml - - name: Set network provider to 'nm' set_fact: network_provider: nm diff --git a/tests/tests_reapply_nm.yml b/tests/tests_reapply_nm.yml index eb48ddb..69fb208 100644 --- a/tests/tests_reapply_nm.yml +++ b/tests/tests_reapply_nm.yml @@ -5,8 +5,6 @@ - hosts: all name: Run playbook 'playbooks/tests_reapply.yml' with nm as provider tasks: - - include_tasks: tasks/el_repo_setup.yml - - name: Set network provider to 'nm' set_fact: network_provider: nm diff --git a/tests/tests_regression_nm.yml b/tests/tests_regression_nm.yml index b2c46e9..9eb8084 100644 --- a/tests/tests_regression_nm.yml +++ b/tests/tests_regression_nm.yml @@ -3,8 +3,6 @@ # set network provider and gather facts - hosts: all tasks: - - include_tasks: tasks/el_repo_setup.yml - - name: Set network provider to 'nm' set_fact: network_provider: nm diff --git a/tests/tests_states_initscripts.yml b/tests/tests_states_initscripts.yml index fa94103..3e55a43 100644 --- a/tests/tests_states_initscripts.yml +++ b/tests/tests_states_initscripts.yml @@ -4,8 +4,6 @@ - hosts: all name: Run playbook 'playbooks/tests_states.yml' with initscripts as provider tasks: - - include_tasks: tasks/el_repo_setup.yml - - name: Set network provider to 'initscripts' set_fact: network_provider: initscripts diff --git a/tests/tests_states_nm.yml b/tests/tests_states_nm.yml index 34c8a24..3164a3a 100644 --- a/tests/tests_states_nm.yml +++ b/tests/tests_states_nm.yml @@ -5,8 +5,6 @@ - hosts: all name: Run playbook 'playbooks/tests_states.yml' with nm as provider tasks: - - include_tasks: tasks/el_repo_setup.yml - - name: Set network provider to 'nm' set_fact: network_provider: nm diff --git a/tests/tests_team_nm.yml b/tests/tests_team_nm.yml index 8048029..0516765 100644 --- a/tests/tests_team_nm.yml +++ b/tests/tests_team_nm.yml @@ -5,8 +5,6 @@ - hosts: all name: Run playbook 'playbooks/tests_team.yml' with nm as provider tasks: - - include_tasks: tasks/el_repo_setup.yml - - name: Set network provider to 'nm' set_fact: network_provider: nm diff --git a/tests/tests_unit.yml b/tests/tests_unit.yml index 44dfaec..8c5388b 100644 --- a/tests/tests_unit.yml +++ b/tests/tests_unit.yml @@ -3,7 +3,7 @@ - hosts: all name: Setup for test running tasks: - - include_tasks: tasks/el_repo_setup.yml + - include_tasks: tasks/enable_epel.yml - name: Install dependencies package: diff --git a/tests/tests_vlan_mtu_initscripts.yml b/tests/tests_vlan_mtu_initscripts.yml index dcd5d74..37770a9 100644 --- a/tests/tests_vlan_mtu_initscripts.yml +++ b/tests/tests_vlan_mtu_initscripts.yml @@ -4,8 +4,6 @@ - hosts: all name: Run playbook 'playbooks/tests_vlan_mtu.yml' with initscripts as provider tasks: - - include_tasks: tasks/el_repo_setup.yml - - name: Set network provider to 'initscripts' set_fact: network_provider: initscripts diff --git a/tests/tests_vlan_mtu_nm.yml b/tests/tests_vlan_mtu_nm.yml index c38263c..f201de3 100644 --- a/tests/tests_vlan_mtu_nm.yml +++ b/tests/tests_vlan_mtu_nm.yml @@ -5,8 +5,6 @@ - hosts: all name: Run playbook 'playbooks/tests_vlan_mtu.yml' with nm as provider tasks: - - include_tasks: tasks/el_repo_setup.yml - - name: Set network provider to 'nm' set_fact: network_provider: nm diff --git a/tests/tests_wireless_nm.yml b/tests/tests_wireless_nm.yml index 03b5ad6..86baf67 100644 --- a/tests/tests_wireless_nm.yml +++ b/tests/tests_wireless_nm.yml @@ -5,8 +5,6 @@ - hosts: all name: Run playbook 'playbooks/tests_wireless.yml' with nm as provider tasks: - - include_tasks: tasks/el_repo_setup.yml - - name: Set network provider to 'nm' set_fact: network_provider: nm -- 2.30.2