srbala/os-autoinst-distri-fedora
1
0
Fork 0
mirror of https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git synced 2024-11-29 00:53:09 +00:00
Code Issues Releases Activity

_check_install_source: drop branches for EOL releases

Browse Source 
Thankfully this all calmed down a bit so we can simplify it a
lot. Clean things up a bit at the same time; escaping nested
single quotes is a lot clearer than concatening blocks with
different quote marks.

Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
Adam Williamson 2022-12-13 11:36:28 -08:00
parent ea8e1f950d
commit a664c10817
1 changed files with 8 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tests/_check_install_source.pm
View File

@ -28,19 +28,13 @@ sub run {
# "repo addrepo" is older format from before Fedora 37, # "repo addrepo" is older format from before Fedora 37,
# "Add the 'addrepo" is newer format from F37+ # "Add the 'addrepo" is newer format from F37+
assert_script_run 'grep "\(repo \|Add the \'\)addrepo.*' . ${addrepourl} . '" /tmp/packaging.log'; assert_script_run 'grep "\(repo \|Add the \'\)addrepo.*' . ${addrepourl} . '" /tmp/packaging.log';
# ...this line tells us it added the repo called 'addrepo' (<F36)... # ...this line tells us it added the repo called 'addrepo'
if (script_run 'grep "\(added\|enabled\) repo: .addrepo." /tmp/packaging.log') { assert_script_run 'grep "Added the \'addrepo\'" /tmp/anaconda.log';
# this is F36+ # ...and this tells us it worked (I hope).
assert_script_run 'grep "Added the ' . "'addrepo'" . '" /tmp/anaconda.log'; assert_script_run 'grep "Load metadata for the \'addrepo\'" /tmp/anaconda.log';
}
# ...and one of these tells us it worked (I hope). This one is <F35...
if (script_run 'grep "enabled repo.*nfs" /tmp/packaging.log') {
# ...these are F35+
assert_script_run 'grep "Load metadata for the ' . "'addrepo'" . '" /tmp/anaconda.log';
assert_script_run 'grep "Loaded metadata from.*file:///run/install/addrepo.nfs" /tmp/anaconda.log'; assert_script_run 'grep "Loaded metadata from.*file:///run/install/addrepo.nfs" /tmp/anaconda.log';
} }
} }
}
if ($repourl =~ /^hd:/) { if ($repourl =~ /^hd:/) {
assert_script_run "mount |grep 'fedora_image.iso'"; assert_script_run "mount |grep 'fedora_image.iso'";
} }
@ -58,29 +52,9 @@ sub run {
elsif ($repourl) { elsif ($repourl) {
# there are only three hard problems in software development: # there are only three hard problems in software development:
# naming things, cache expiry, off-by-one errors...and quoting # naming things, cache expiry, off-by-one errors...and quoting
# we need single quotes (at the perl level) around the start assert_script_run 'grep "Added the \'anaconda\'" /tmp/anaconda.log';
# of this, so the backslashes are not interpreted by perl but assert_script_run 'grep "Load metadata for the \'anaconda\'" /tmp/anaconda.log';
# passed through to ultimately be interpreted by 'grep' assert_script_run 'grep "Loaded metadata from.*' . ${repourl} . '" /tmp/anaconda.log';
# itself. We need double quotes around $repourl so that *is*
# interpreted by perl. And we need quotes around the entire
# expression at the bash level, and single quotes around the
# text 'anaconda' at the level of grep, as the string we're
# actually matching on literally has 'anaconda' in it.
if (script_run 'grep "enabled repo: ' . "'anaconda'.*${repourl}" . '" /tmp/packaging.log') {
# in F35+, the "enabled repo" log line is gone, instead
# we'll check some log messages from the dnf manager module
# that show up in anaconda.log. Can drop the above branch
# and only go with this branch after F34 EOL.
#
# in F36+, the "added repo: " line in packaging.log is
# gone too, instead we get "Added the 'XXX' repository"
# in anaconda.log
if (script_run 'grep "added repo: ' . "'anaconda'.*${repourl}" . '" /tmp/packaging.log') {
assert_script_run 'grep "Added the ' . "'anaconda'" . '" /tmp/anaconda.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.