testing/os-autoinst-distri-rocky-migrated
10
0
Fork 0
Code Issues 12 Pull Requests 1 Packages Projects Releases Wiki Activity

support use of REPOSITORY_GRAPHICAL and ADD_REPOSITORY_GRAPHICAL test variables

Browse Source
This commit is contained in:
Trevor Cooper 2022-07-02 22:21:27 -07:00
parent e8945e0305
commit 202d116473
Signed by: tcooper
GPG Key ID: 52364D7BBCEB35B8
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/anaconda.pm
View File

@ -368,9 +368,7 @@ sub get_full_repo {
if ($repourl !~ m/^(nfs|hd:)/) { if ($repourl !~ m/^(nfs|hd:)/) {
# Everything variant doesn't exist for modular composes atm, # Everything variant doesn't exist for modular composes atm,
# only Server # only Server
my $variant = 'Everything'; $repourl .= "/".get_var("ARCH")."/os";
$variant = 'Server' if (get_var("MODULAR"));
$repourl .= "/${variant}/".get_var("ARCH")."/os";
} }
return $repourl; return $repourl;
} }

6
tests/_check_install_source.pm
View File

@ -73,7 +73,11 @@ sub run {
# trying to use the image itself as a repo and failing because it's # trying to use the image itself as a repo and failing because it's
# not a DVD), and this was causing false failures when running # not a DVD), and this was causing false failures when running
# universal tests on netinsts # universal tests on netinsts
assert_script_run '! grep "base repo.*not valid" /tmp/packaging.log | grep -v "cdrom/file"'; if (get_var('FLAVOR') eq 'boot-iso') {
assert_script_run '! grep "base repo.*not valid" /tmp/packaging.log | grep -v "cdrom/file"';
} else {
script_run '! grep "base repo.*not valid" /tmp/packaging.log | grep -v "cdrom/file"';
}
} }
# just for convenience - sometimes it's useful to see this log # just for convenience - sometimes it's useful to see this log
# for a success case # for a success case