From d4896d26c07fcf13ab168d8774ab8534454e185c Mon Sep 17 00:00:00 2001
From: ybonatakis <ybonatakis@suse.com>
Date: Fri, 31 Jul 2020 23:42:32 +0200
Subject: [PATCH 1/2] Validate ftp mirror repo in remote_ssh_target_ftp
 scenario

Schedule validate_mirror_repos in remote_ssh_target_ftp
---
 schedule/yast/remote_ssh/remote_ssh_target_ftp_sle15.yaml | 1 +
 tests/console/validate_mirror_repos.pm                    | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/schedule/yast/remote_ssh/remote_ssh_target_ftp_sle15.yaml b/schedule/yast/remote_ssh/remote_ssh_target_ftp_sle15.yaml
index 3c13dfa3fc74..5360d4ab237e 100644
--- a/schedule/yast/remote_ssh/remote_ssh_target_ftp_sle15.yaml
+++ b/schedule/yast/remote_ssh/remote_ssh_target_ftp_sle15.yaml
@@ -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
diff --git a/tests/console/validate_mirror_repos.pm b/tests/console/validate_mirror_repos.pm
index aab1efa7b00f..c5ce1d2352ae 100644
--- a/tests/console/validate_mirror_repos.pm
+++ b/tests/console/validate_mirror_repos.pm
@@ -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);
 }
 

From 50b1076476ab86e115771921b49873515409d434 Mon Sep 17 00:00:00 2001
From: ybonatakis <ybonatakis@suse.com>
Date: Mon, 3 Aug 2020 16:35:50 +0200
Subject: [PATCH 2/2] Fix mirror directory passed to the installer

---
 lib/bootloader_setup.pm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/bootloader_setup.pm b/lib/bootloader_setup.pm
index 577454b35995..2690c197a42a 100644
--- a/lib/bootloader_setup.pm
+++ b/lib/bootloader_setup.pm
@@ -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 =~ /\/(.+?)(\/.*)/;