mirror of
https://pagure.io/fedora-qa/os-autoinst-distri-fedora.git
synced 2024-11-22 14:03:09 +00:00
Update _check_install_source for NFS addrepo on F35
We need the same alternate check method logic for NFS addrepo on F35 now we're testing F35 updates. This is all getting a bit messy and could maybe stand a refactor at some point... Signed-off-by: Adam Williamson <awilliam@redhat.com>
This commit is contained in:
parent
4c19ed1723
commit
c9356ee196
@ -28,8 +28,12 @@ sub run {
|
|||||||
assert_script_run 'grep "repo addrepo.*' . ${addrepourl} . '" /tmp/packaging.log';
|
assert_script_run 'grep "repo addrepo.*' . ${addrepourl} . '" /tmp/packaging.log';
|
||||||
# ...this line tells us it added the repo called 'addrepo'...
|
# ...this line tells us it added the repo called 'addrepo'...
|
||||||
assert_script_run 'grep "\(added\|enabled\) repo: .addrepo." /tmp/packaging.log';
|
assert_script_run 'grep "\(added\|enabled\) repo: .addrepo." /tmp/packaging.log';
|
||||||
# ...and this line tells us it worked (I hope)
|
# ...and one of these tells us it worked (I hope). This one is <F35...
|
||||||
assert_script_run 'grep "enabled repo.*nfs" /tmp/packaging.log';
|
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';
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($repourl =~ /^hd:/) {
|
if ($repourl =~ /^hd:/) {
|
||||||
|
Loading…
Reference in New Issue
Block a user