1
0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-30 17:33:07 +00:00

Compare commits

...

2 Commits

Author SHA1 Message Date
Adam Williamson
6baf67aefd Work around the f39 toolbox container not existing
On Rawhide, just use an f38 toolbox container for now.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2023-02-13 19:16:09 -08:00
Adam Williamson
619f5a70fe Add glib2 2.75.3 to f38 workarounds (FEDORA-2023-965f517da3)
GNOME blows up without it.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
2023-02-13 15:09:14 -08:00

View File

@ -479,7 +479,7 @@ sub setup_workaround_repo {
my %workarounds = ( my %workarounds = (
"36" => [], "36" => [],
"37" => [], "37" => [],
"38" => ["FEDORA-2023-ad52b2e4b9", "FEDORA-2023-ade2a4ec02"], "38" => ["FEDORA-2023-ad52b2e4b9", "FEDORA-2023-ade2a4ec02", "FEDORA-2023-965f517da3"],
); );
# then we'll download each update for our release: # then we'll download each update for our release:
my $advortasks = $workarounds{$version}; my $advortasks = $workarounds{$version};
@ -582,7 +582,13 @@ sub _repo_setup_updates {
assert_script_run "cd /mnt/update_repo"; assert_script_run "cd /mnt/update_repo";
# 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")) {
type_string "toolbox -y enter\n"; my $tboxcmd = "toolbox -y enter";
# FIXME there's no f39 toolbox container yet:
# https://github.com/containers/toolbox/issues/1233
# drop this workaround when that's fixed
$tboxcmd .= " -r 38" if (get_var("VERSION") eq get_var("RAWREL"));
type_string "$tboxcmd\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;
} }