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

support nfsvers=x parameter as nfs option

Browse Source 
Required to validate bypass for pending bug
https://bugzilla.redhat.com/show_bug.cgi?id=1386059

Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
This commit is contained in:
Michel Normand 2017-03-01 04:59:37 -05:00
parent c086b3c0c1
commit 9aa83cffd1
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
tests/_check_install_source.pm
View File

@ -17,8 +17,9 @@ sub run {
# check that the repo was used # check that the repo was used
$self->root_console; $self->root_console;
if ($repourl =~ s/^nfs://) { if ($repourl =~ s/^nfs://) {
$repourl =~ s/^nfsvers=.://;
# the above both checks if we're dealing with an NFS URL, and # the above both checks if we're dealing with an NFS URL, and
# strips the 'nfs:' from it if so # strips the 'nfs:' and 'nfsvers=.:' from it if so
# message is in packaging.log up to F26, anaconda.log F27+ # message is in packaging.log up to F26, anaconda.log F27+
assert_script_run "grep 'mounting ${repourl}' /tmp/packaging.log /tmp/anaconda.log"; assert_script_run "grep 'mounting ${repourl}' /tmp/packaging.log /tmp/anaconda.log";
} }

3
tests/install_source_graphical.pm
View File

@ -49,8 +49,9 @@ sub run {
} }
elsif (get_var("REPOSITORY_GRAPHICAL")) { elsif (get_var("REPOSITORY_GRAPHICAL")) {
$repourl = get_full_repo(get_var("REPOSITORY_GRAPHICAL")); $repourl = get_full_repo(get_var("REPOSITORY_GRAPHICAL"));
# strip the 'nfs:' for typing here # strip the nfs and nfsvers prefix if present for typing here
$repourl =~ s/^nfs://; $repourl =~ s/^nfs://;
$repourl =~ s/^nfsvers=.://;
type_safely $repourl; type_safely $repourl;
} }