Skip to content

Commit 63a1945

Browse files
authored
Merge pull request #24929 from dzedro/kea
kea: Check kea version instead product
2 parents b507e44 + c15110c commit 63a1945

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

tests/network/kea_server.pm

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ use lockapi;
2020
use utils qw(zypper_call systemctl);
2121
use network_utils 'iface';
2222
use serial_terminal 'select_serial_terminal';
23-
use version_utils qw(is_sle is_tumbleweed);
23+
use version_utils qw(is_sle is_tumbleweed package_version_cmp);
2424

2525
sub run {
2626
select_serial_terminal;
@@ -35,7 +35,8 @@ sub run {
3535
assert_script_run("sed -i 's/\"eth0\"/\"$server_nic\"/' /etc/kea/kea-dhcp4.conf") unless $server_nic eq 'eth0';
3636
assert_script_run("kea-dhcp4 -t /etc/kea/kea-dhcp4.conf", fail_message => 'Kea dhcp4 config invalid');
3737

38-
my $package = (is_sle('>=16') || is_tumbleweed) ? 'kea-dhcp4' : 'kea';
38+
my $kea_version = script_output("rpm -q --qf '%{version}' kea");
39+
my $package = (package_version_cmp($kea_version, '2.6.3') >= 0) ? 'kea-dhcp4' : 'kea';
3940
systemctl("enable --now $package");
4041
systemctl("is-active $package");
4142

0 commit comments

Comments
 (0)