mirror of
https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
synced 2024-11-24 23:03:08 +00:00
rpmostree_overlay: try to cancel running operations
I've seen a few cases of this test failing because there was some running operation when it tries to do `rpm-ostree install`. I think this is GNOME Software checking for updates or something, I've seen it on my own Silverblue install too. Let's just throw some `rpm-ostree cancel`s at it and hope that helps. Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
e22f0c66e4
commit
0bda4ad073
@ -20,6 +20,13 @@ sub run {
|
|||||||
# disable graphical boot on graphical images
|
# disable graphical boot on graphical images
|
||||||
assert_script_run "systemctl set-default multi-user.target";
|
assert_script_run "systemctl set-default multi-user.target";
|
||||||
|
|
||||||
|
# Try and cancel any running rpm-ostree operations (GNOME Software
|
||||||
|
# may be trying to refresh or something). This often needs to be
|
||||||
|
# done multiple times, so let's go with 6
|
||||||
|
for my $n (1 .. 6) {
|
||||||
|
script_run "rpm-ostree cancel";
|
||||||
|
}
|
||||||
|
|
||||||
# Install htop as rpm-ostree overlay. Let's have timeout defined
|
# Install htop as rpm-ostree overlay. Let's have timeout defined
|
||||||
# quite generously, because it loads the package DBs.
|
# quite generously, because it loads the package DBs.
|
||||||
assert_script_run "rpm-ostree install htop", timeout => 300;
|
assert_script_run "rpm-ostree install htop", timeout => 300;
|
||||||
@ -63,6 +70,11 @@ sub run {
|
|||||||
# See if postgresql is started
|
# See if postgresql is started
|
||||||
assert_script_run "systemctl is-active postgresql";
|
assert_script_run "systemctl is-active postgresql";
|
||||||
|
|
||||||
|
# Cancel running operations again
|
||||||
|
for my $n (1 .. 6) {
|
||||||
|
script_run "rpm-ostree cancel";
|
||||||
|
}
|
||||||
|
|
||||||
# Uninstall htop and postgresql again.
|
# Uninstall htop and postgresql again.
|
||||||
assert_script_run "rpm-ostree uninstall htop postgresql-server", timeout => 300;
|
assert_script_run "rpm-ostree uninstall htop postgresql-server", timeout => 300;
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user