Commit c821d2ad authored by Filip Pokryvka's avatar Filip Pokryvka 🤸🏻

dhcpd: do not install in environment, installed by prepare/envsetup.sh

remove `dhcpd` instalatation from environment.py

fix package name for Fedora and RHEL8 (it is not `dhcp` anymore, but 
`dhcp-server`)
parent e188cb76
......@@ -738,13 +738,6 @@ def before_scenario(context, scenario):
call("printf '# configured by beaker-test\n[main]\ndhcp=dhclient\n' > /etc/NetworkManager/conf.d/99-xtest-dhcp-dhclient.conf", shell=True)
restart_NM_service()
if 'dhcpd' in scenario.tags:
print ("---------------------------")
print ("installing dhcp")
wait_for_testeth0()
if call('rpm -q --quiet dhcp-server', shell=True) != 0:
call('yum -y install dhcp-server', shell=True)
if 'dummy' in scenario.tags:
print ("---------------------------")
print ("removing dummy devices")
......
......@@ -71,7 +71,7 @@ install_fedora_packages () {
dnf -4 -y install perl-IO-Pty-Easy perl-IO-Tty
# Dnf more deps
dnf -4 -y install git nmap-ncat hostapd tcpreplay python3-netaddr dhcp-relay iw net-tools psmisc firewalld dhcp ethtool python3-dbus python3-gobject dnsmasq tcpdump wireshark-cli
dnf -4 -y install git nmap-ncat hostapd tcpreplay python3-netaddr dhcp-relay iw net-tools psmisc firewalld dhcp-server ethtool python3-dbus python3-gobject dnsmasq tcpdump wireshark-cli
# Install behave with better reporting
if python3 -V |grep -q "3.6"; then
......@@ -144,7 +144,7 @@ install_el8_packages () {
dnf -4 -y install https://kojipkgs.fedoraproject.org//packages/perl-IO-Pty-Easy/0.10/5.fc28/noarch/perl-IO-Pty-Easy-0.10-5.fc28.noarch.rpm https://kojipkgs.fedoraproject.org//packages/perl-IO-Tty/1.12/11.fc28/$(arch)/perl-IO-Tty-1.12-11.fc28.$(arch).rpm
# Dnf more deps
dnf -4 -y install git python3-netaddr dhcp-relay iw net-tools psmisc firewalld dhcp ethtool python3-dbus python3-gobject dnsmasq tcpdump wireshark-cli --skip-broken
dnf -4 -y install git python3-netaddr dhcp-relay iw net-tools psmisc firewalld dhcp-server ethtool python3-dbus python3-gobject dnsmasq tcpdump wireshark-cli --skip-broken
# Install behave with better reporting
dnf -4 -y install https://kojipkgs.fedoraproject.org//packages/tcpreplay/4.2.5/4.fc28/$(uname -p)/tcpreplay-4.2.5-4.fc28.$(uname -p).rpm
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment