srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2025-02-16 20:44:31 +00:00
Code Issues Releases Activity

Revert "Work around there being no F40 toolbox container yet"

Browse Source 
This reverts commit 265e5c027a.
The f40 toolbox container is now findable, so this shouldn't be
needed any more.
This commit is contained in:
Adam Williamson 2023-08-10 11:24:17 -07:00
parent e7af83bdc9
commit edcfed346d
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/utils.pm
View File

@ -571,12 +571,7 @@ sub _repo_setup_updates {
# will get the packages from the update. # will get the packages from the update.
# on CANNED, we need to enter the toolbox at this point # on CANNED, we need to enter the toolbox at this point
if (get_var("CANNED")) { if (get_var("CANNED")) {
# FIXME: as of 2023-08, there's no toolbox container for type_string "toolbox -y enter\n";
# F40 (new Rawhide) so we need to use 39:
# https://github.com/containers/toolbox/issues/1233
my $extraarg = "";
$extraarg = "-r 39 " if ($version eq "40");
type_string "toolbox ${extraarg}-y enter\n";
# look for the little purple dot # look for the little purple dot
assert_screen "console_in_toolbox", 180; assert_screen "console_in_toolbox", 180;
} }