Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Validate ftp mirror repo in remote_ssh_target_ftp scenario #10768

Merged
merged 2 commits into from
Aug 4, 2020
Merged

Validate ftp mirror repo in remote_ssh_target_ftp scenario #10768

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d4896d2
Validate ftp mirror repo in remote_ssh_target_ftp scenario
b10n1k Jul 31, 2020
50b1076
Fix mirror directory passed to the installer
b10n1k Aug 3, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/bootloader_setup.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -542,7 +542,7 @@ sub select_installation_source {
my ($m_server, $m_share, $m_directory);

# Parse SUSEMIRROR into variables
if ($m_mirror =~ m{^[a-z]+://([a-zA-Z0-9.-]*)(/.*)$}) {
if ($m_mirror =~ m{^[a-z]+://([a-zA-Z0-9.-]*)/(.*)$}) {
($m_server, $m_directory) = ($1, $2);
if ($m_protocol eq "smb") {
($m_share, $m_directory) = $m_directory =~ /\/(.+?)(\/.*)/;
Expand Down
1 change: 1 addition & 0 deletions schedule/yast/remote_ssh/remote_ssh_target_ftp_sle15.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ schedule:
- console/force_scheduled_tasks
- console/textinfo
- console/hostname
- console/validate_mirror_repos
- console/installation_snapshots
- console/zypper_lr
- console/zypper_ref
Expand Down
2 changes: 1 addition & 1 deletion tests/console/validate_mirror_repos.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ sub run {
$mirror_src .= '?ssl_verify=no' if ($method eq 'HTTPS');
my $sle_prod = uc get_var('SLE_PRODUCT') . get_var('VERSION');

record_info("Check mirror", "Validate if mirror used for installation is added in the installed system");
record_info("Mirror Validation", "Validate $mirror_src used for installation is added in the installed system");
validate_repo_enablement(alias => $sle_prod, name => $sle_prod, uri => $mirror_src);
}

Expand Down