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

FEATURE: Add DNF_CONTENTDIR override support #119

Merged
tcooper merged 14 commits from issue_118 into 9.0_release_fixes 2022-07-10 21:05:04 +00:00
Conversation 2 Commits 14 Files Changed 25 +6 -4
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 202d116473 - Show all commits

4
lib/anaconda.pm
View File

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

4
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
# not a DVD), and this was causing false failures when running
# universal tests on netinsts
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
# for a success case