From b0f5d6352ab0435985795b12399671efd0b11371 Mon Sep 17 00:00:00 2001 From: Gris Ge Date: Mon, 21 Dec 2020 22:05:18 +0800 Subject: [PATCH] test: Fix EL6 repo * As EPEL6 has been moved to archive, created `tests/tasks/enable_epel.yml`. * As CentOS6 has been moved to vault, created `tests/tests_00_setup.yml`. Signed-off-by: Gris Ge --- .../playbooks/integration_pytest_python3.yml | 5 ---- tests/tasks/el_repo_setup.yml | 26 +++++++++++++++++++ tests/tasks/enable_epel.yml | 24 +++++++++++++++++ tests/tasks/setup_802_1x_server.yml | 9 ------- tests/tasks/setup_mock_wifi.yml | 9 ------- tests/tests_802_1x_nm.yml | 1 + tests/tests_802_1x_updated_nm.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 | 10 +------ tests/tests_vlan_mtu_initscripts.yml | 2 ++ tests/tests_vlan_mtu_nm.yml | 2 ++ tests/tests_wireless_nm.yml | 2 ++ 30 files changed, 90 insertions(+), 34 deletions(-) create mode 100644 tests/tasks/el_repo_setup.yml create mode 100644 tests/tasks/enable_epel.yml diff --git a/tests/playbooks/integration_pytest_python3.yml b/tests/playbooks/integration_pytest_python3.yml index ad8418c..3c7d3fb 100644 --- a/tests/playbooks/integration_pytest_python3.yml +++ b/tests/playbooks/integration_pytest_python3.yml @@ -9,11 +9,6 @@ - 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 new file mode 100644 index 0000000..0656e8c --- /dev/null +++ b/tests/tasks/el_repo_setup.yml @@ -0,0 +1,26 @@ +# 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/enable_epel.yml b/tests/tasks/enable_epel.yml new file mode 100644 index 0000000..7924bd4 --- /dev/null +++ b/tests/tasks/enable_epel.yml @@ -0,0 +1,24 @@ +# SPDX-License-Identifier: BSD-3-Clause +--- +- name: Enable EPEL {{ ansible_distribution_major_version }} + # yamllint disable-line rule:line-length + command: yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm + args: + warn: false + creates: /etc/yum.repos.d/epel.repo + when: + - ansible_distribution in ['RedHat', 'CentOS'] + - ansible_distribution_major_version in ['7', '8'] + +- name: Enable EPEL 6 + copy: + dest: /etc/yum.repos.d/epel.repo + content: | + [epel] + name=Extra Packages for Enterprise Linux 6 - $basearch + baseurl=https://archives.fedoraproject.org/pub/archive/epel/6/$basearch + enabled=1 + gpgcheck=0 + when: + - ansible_distribution in ['RedHat', 'CentOS'] + - ansible_distribution_major_version == '6' diff --git a/tests/tasks/setup_802_1x_server.yml b/tests/tasks/setup_802_1x_server.yml index 2873cb4..49d1ce1 100644 --- a/tests/tasks/setup_802_1x_server.yml +++ b/tests/tasks/setup_802_1x_server.yml @@ -1,14 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause --- -- name: Install EPEL on enterprise Linux for hostapd - # yamllint disable-line rule:line-length - command: yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm - args: - warn: false - creates: /etc/yum.repos.d/epel.repo - when: - - ansible_distribution in ['RedHat', 'CentOS'] - - name: Install hostapd package: name: hostapd diff --git a/tests/tasks/setup_mock_wifi.yml b/tests/tasks/setup_mock_wifi.yml index d2dbba3..997b704 100644 --- a/tests/tasks/setup_mock_wifi.yml +++ b/tests/tasks/setup_mock_wifi.yml @@ -1,14 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause --- -- name: Install EPEL on enterprise Linux for hostapd - # yamllint disable-line rule:line-length - command: yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm - args: - warn: false - creates: /etc/yum.repos.d/epel.repo - when: - - ansible_distribution in ['RedHat', 'CentOS'] - - 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 288cd5d..a27d8ea 100644 --- a/tests/tests_802_1x_nm.yml +++ b/tests/tests_802_1x_nm.yml @@ -5,6 +5,7 @@ - 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 bd335e4..5a25f5b 100644 --- a/tests/tests_802_1x_updated_nm.yml +++ b/tests/tests_802_1x_updated_nm.yml @@ -5,6 +5,7 @@ - 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_initscripts.yml b/tests/tests_bond_initscripts.yml index 8fa74c5..32fcc32 100644 --- a/tests/tests_bond_initscripts.yml +++ b/tests/tests_bond_initscripts.yml @@ -4,6 +4,7 @@ - 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 8ac6cbd..7075d95 100644 --- a/tests/tests_bond_nm.yml +++ b/tests/tests_bond_nm.yml @@ -5,6 +5,7 @@ - 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 db5663c..8ce42e6 100644 --- a/tests/tests_bridge_initscripts.yml +++ b/tests/tests_bridge_initscripts.yml @@ -4,6 +4,7 @@ - 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 c565952..3d1b53a 100644 --- a/tests/tests_bridge_nm.yml +++ b/tests/tests_bridge_nm.yml @@ -5,6 +5,7 @@ - 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 f6f7550..e196314 100644 --- a/tests/tests_default.yml +++ b/tests/tests_default.yml @@ -5,6 +5,7 @@ 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 cc8b875..006889c 100644 --- a/tests/tests_default_initscripts.yml +++ b/tests/tests_default_initscripts.yml @@ -2,6 +2,7 @@ --- - 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 8138ca9..54bc3e1 100644 --- a/tests/tests_default_nm.yml +++ b/tests/tests_default_nm.yml @@ -2,6 +2,7 @@ --- - 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 62e75fe..366b052 100644 --- a/tests/tests_ethernet_initscripts.yml +++ b/tests/tests_ethernet_initscripts.yml @@ -4,6 +4,8 @@ - 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 ecefa14..238172d 100644 --- a/tests/tests_ethernet_nm.yml +++ b/tests/tests_ethernet_nm.yml @@ -5,6 +5,8 @@ - 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 6aea73b..5bac5d3 100644 --- a/tests/tests_ethtool_features_initscripts.yml +++ b/tests/tests_ethtool_features_initscripts.yml @@ -2,6 +2,7 @@ # 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 30c6faa..2027862 100644 --- a/tests/tests_ethtool_features_nm.yml +++ b/tests/tests_ethtool_features_nm.yml @@ -5,6 +5,8 @@ - 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 5514182..64e2875 100644 --- a/tests/tests_helpers_and_asserts.yml +++ b/tests/tests_helpers_and_asserts.yml @@ -3,6 +3,8 @@ - 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 153214d..9b80bd4 100644 --- a/tests/tests_integration_pytest.yml +++ b/tests/tests_integration_pytest.yml @@ -1,7 +1,8 @@ # SPDX-License-Identifier: BSD-3-Clause --- -- name: Empty play to gather facts - hosts: all +- hosts: all + tasks: + - include_tasks: tasks/el_repo_setup.yml - 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 99306a1..67fcffe 100644 --- a/tests/tests_provider_nm.yml +++ b/tests/tests_provider_nm.yml @@ -5,6 +5,8 @@ - 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 69fb208..eb48ddb 100644 --- a/tests/tests_reapply_nm.yml +++ b/tests/tests_reapply_nm.yml @@ -5,6 +5,8 @@ - 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 9eb8084..b2c46e9 100644 --- a/tests/tests_regression_nm.yml +++ b/tests/tests_regression_nm.yml @@ -3,6 +3,8 @@ # 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 3e55a43..fa94103 100644 --- a/tests/tests_states_initscripts.yml +++ b/tests/tests_states_initscripts.yml @@ -4,6 +4,8 @@ - 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 3164a3a..34c8a24 100644 --- a/tests/tests_states_nm.yml +++ b/tests/tests_states_nm.yml @@ -5,6 +5,8 @@ - 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 0516765..8048029 100644 --- a/tests/tests_team_nm.yml +++ b/tests/tests_team_nm.yml @@ -5,6 +5,8 @@ - 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 5c248e3..a410fbd 100644 --- a/tests/tests_unit.yml +++ b/tests/tests_unit.yml @@ -3,15 +3,7 @@ - hosts: all name: Setup for test running tasks: - - name: Install EPEL on enterprise Linux for python2-mock - # yamllint disable-line rule:line-length - command: yum install -y https://dl.fedoraproject.org/pub/epel/epel-release-latest-{{ ansible_distribution_major_version }}.noarch.rpm - args: - warn: false - creates: /etc/yum.repos.d/epel.repo - when: - - ansible_distribution in ['RedHat', 'CentOS'] - - ansible_distribution_major_version in ['6', '7'] + - include_tasks: tasks/el_repo_setup.yml - name: Install dependencies package: diff --git a/tests/tests_vlan_mtu_initscripts.yml b/tests/tests_vlan_mtu_initscripts.yml index 37770a9..dcd5d74 100644 --- a/tests/tests_vlan_mtu_initscripts.yml +++ b/tests/tests_vlan_mtu_initscripts.yml @@ -4,6 +4,8 @@ - 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 f201de3..c38263c 100644 --- a/tests/tests_vlan_mtu_nm.yml +++ b/tests/tests_vlan_mtu_nm.yml @@ -5,6 +5,8 @@ - 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 86baf67..03b5ad6 100644 --- a/tests/tests_wireless_nm.yml +++ b/tests/tests_wireless_nm.yml @@ -5,6 +5,8 @@ - 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