Skip to content

Commit e5aca93

Browse files
committed
test: do not need to install from epel or pip
The tests should not install anything from outside of the distribution unless absolutely necessary, like the copr repos. All of the EPEL dependencies have been removed or replaced with coprs. We do not need to install pytest from pip since it is available as `pytest-3` from `python3-pytest`. We do not need `git` or `rsync` in the tests. Signed-off-by: Rich Megginson <[email protected]>
1 parent 53be949 commit e5aca93

File tree

7 files changed

+7
-82
lines changed

7 files changed

+7
-82
lines changed
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
dbus-tools
2-
git
32
network-scripts
4-
python3-pip
5-
rsync
3+
python3-pytest
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11
dbus-tools
22
ethtool
3-
git
43
hostapd
54
NetworkManager
65
network-scripts
76
openssl
87
procps-ng
9-
python3-pip
10-
rsync
8+
python3-pytest
119
systemd-resolved
1210
wpa_supplicant
Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
dbus-tools
22
ethtool
3-
git
43
hostapd
54
NetworkManager
65
network-scripts
76
openssl
87
procps-ng
9-
python3-pip
10-
rsync
8+
python3-pytest

tests/playbooks/integration_pytest_python3.yml

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,7 @@
44
hosts: all
55
vars:
66
rpmdependencies:
7-
- git
8-
- python3-pip
9-
- rsync
7+
- python3-pytest
108

119
tasks:
1210
- name: Install rpm dependencies
@@ -16,11 +14,6 @@
1614
use: "{{ (__network_is_ostree | d(false)) |
1715
ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
1816

19-
- name: Install Pytest
20-
command: "pip3 install pytest"
21-
changed_when: false
22-
23-
2417
# Import needed in order to install initscripts dependencies on the remote
2518
# system.
2619
- name: Import the playbook '../tests_default_initscripts.yml'
@@ -135,7 +128,7 @@
135128
block:
136129
- name: Run pytest with nm
137130
command: >
138-
pytest
131+
pytest-3
139132
{{ _rundir.path }}/{{ tests_directory | basename }}/integration/
140133
--provider=nm
141134
register: playbook_run
@@ -157,7 +150,7 @@
157150
ternary('ansible.posix.rhel_rpm_ostree', omit) }}"
158151
- name: Run pytest with initscripts
159152
command: >
160-
pytest
153+
pytest-3
161154
{{ _rundir.path }}/{{ tests_directory | basename }}/integration/
162155
--provider=initscripts
163156
register: playbook_run

tests/tasks/create_test_interfaces_with_dhcp.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
register: __install_status
1010
# sometimes the rpm download returns a 403 - I think it is when too
1111
# many parallel jobs attempt the download from the same controller in
12-
# too short a period of time, so the epel server throttles additional
12+
# too short a period of time, so the server throttles additional
1313
# downloads - use a retry here to mitigate
1414
until: __install_status is success
1515
retries: 6

tests/tasks/el_repo_setup.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,3 @@
5050
when:
5151
- ansible_distribution == 'CentOS'
5252
- ansible_distribution_major_version == '6'
53-
- name: Include the task 'enable_epel.yml'
54-
include_tasks: enable_epel.yml
55-
when: not __network_is_ostree | d(false)

tests/tasks/enable_epel.yml

Lines changed: 0 additions & 59 deletions
This file was deleted.

0 commit comments

Comments
 (0)