srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-24 06:43:08 +00:00
Code Issues Releases Activity

Update cockpit autoupdate test for new dnf5 service

Browse Source 
The service cockpit enables is different when it detects dnf5,
since cockpit 317. Let's just make this an F40/F41 boundary
thing, and add the cockpit 317 update as a workaround for F41
until it goes stable.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2024-05-29 17:43:12 -07:00
parent af06ac0809
commit f14200e50d
2 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/utils.pm
View File

@ -477,7 +477,7 @@ sub get_workarounds {
"38" => [], "38" => [],
"39" => [], "39" => [],
"40" => [], "40" => [],
"41" => [], "41" => ["FEDORA-2024-fa260c31e8"],
); );
my $advortasks = $workarounds{$version}; my $advortasks = $workarounds{$version};
return @$advortasks; return @$advortasks;

9
tests/server_cockpit_autoupdate.pm
View File

@ -32,11 +32,14 @@ sub run {
# Quit Cockpit # Quit Cockpit
quit_firefox; quit_firefox;
# Check that the dnf-automatic service has started # this is a dnf4 vs. dnf5 thing
assert_script_run "systemctl is-active dnf-automatic-install.timer"; my $relnum = get_release_number;
my $service = $relnum > 40 ? "dnf5-automatic" : "dnf-automatic-install";
# Check that the service has started
assert_script_run "systemctl is-active ${service}.timer";
# Check that it is scheduled correctly # Check that it is scheduled correctly
validate_script_output "systemctl show dnf-automatic-install.timer | grep TimersCalendar", sub { $_ =~ "06:00:00" }; validate_script_output "systemctl show ${service}.timer | grep TimersCalendar", sub { $_ =~ "06:00:00" };
} }
sub test_flags { sub test_flags {