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

Update check_install_source checks for anaconda changes

Browse Source 
Since f33b50e, anaconda doesn't log "enabled repo:" any more. To
ensure the repo actually is enabled we need to check some other
lines. Good news is, we don't need the 'anaconda'|'' dodge any
more, so we can drop that.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2021-05-25 17:57:07 -07:00
parent 4a11af9958
commit c8004201ae
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
tests/_check_install_source.pm
View File

@ -55,11 +55,15 @@ sub run {
# expression at the bash level, and single quotes around the # expression at the bash level, and single quotes around the
# text 'anaconda' at the level of grep, as the string we're # text 'anaconda' at the level of grep, as the string we're
# actually matching on literally has 'anaconda' in it. # actually matching on literally has 'anaconda' in it.
# ('anaconda'|'') is a workaround for an anaconda bug that if (script_run 'grep "enabled repo: ' . "'anaconda'.*${repourl}" . '" /tmp/packaging.log') {
# happens since 2018-06, can be removed after # in F35+, the "enabled repo" log line is gone, instead
# https://github.com/rhinstaller/anaconda/pull/1519 is merged # we'll check some log messages from the dnf manager module
# and all previous releases go EOL. # that show up in anaconda.log. Can drop the above branch
assert_script_run 'grep "enabled repo: ' . "\\('anaconda'\\|''\\).*${repourl}" . '" /tmp/packaging.log'; # and only go with the below branch after F34 EOL
assert_script_run 'grep "added repo: ' . "'anaconda'.*${repourl}" . '" /tmp/packaging.log';
assert_script_run 'grep "Load metadata for the ' . "'anaconda'" . '" /tmp/anaconda.log';
assert_script_run 'grep "Loaded metadata from ' . ".*${repourl}" . '" /tmp/anaconda.log';
}
} }
if ($repourl) { if ($repourl) {
# check we don't have an error indicating our repo wasn't used. # check we don't have an error indicating our repo wasn't used.