Use http protocol to access OSD repo due to cc

https://progress.opensuse.org/issues/170422
os-autoinst · Feb 8, 2025 · 68083c0 · 68083c0
1 parent da05c77
commit 68083c0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/lib/repo_tools.pm b/lib/repo_tools.pm
@@ -416,13 +416,13 @@ sub prepare_source_repo {
     my $cmd;
     if (is_sle) {
         if (is_sle('>=15') and get_var(get_repo_var_name("MODULE_BASESYSTEM_SOURCE"))) {
-            zypper_call("ar -f " . "$utils::OPENQA_FTP_URL/" . get_var(get_repo_var_name("MODULE_BASESYSTEM_SOURCE")) . " repo-source");
+            zypper_call("ar -f " . "$utils::OPENQA_HTTP_URL/" . get_var(get_repo_var_name("MODULE_BASESYSTEM_SOURCE")) . " repo-source");
         }
         elsif (is_sle('>=12-SP4') and get_var('REPO_SLES_SOURCE')) {
-            zypper_call("ar -f " . "$utils::OPENQA_FTP_URL/" . get_var('REPO_SLES_SOURCE') . " repo-source");
+            zypper_call("ar -f " . "$utils::OPENQA_HTTP_URL/" . get_var('REPO_SLES_SOURCE') . " repo-source");
         }
         elsif (is_sle('>=12-SP4') and get_var('REPO_SLES_POOL_SOURCE')) {
-            zypper_call("ar -f " . "$utils::OPENQA_FTP_URL/" . get_var('REPO_SLES_POOL_SOURCE') . " repo-source");
+            zypper_call("ar -f " . "$utils::OPENQA_HTTP_URL/" . get_var('REPO_SLES_POOL_SOURCE') . " repo-source");
         }
         # SLE maintenance tests are assumed to be SCC registered
         # and source repositories disabled by default

diff --git a/lib/utils.pm b/lib/utils.pm
@@ -75,6 +75,7 @@ our @EXPORT = qw(
   get_root_console_tty
   get_x11_console_tty
   OPENQA_FTP_URL
+  OPENQA_HTTP_URL
   IN_ZYPPER_CALL
   arrays_differ
   arrays_subset
@@ -153,6 +154,9 @@ use constant VERY_SLOW_TYPING_SPEED => 4;
 # openQA internal ftp server url
 our $OPENQA_FTP_URL = "ftp://openqa.suse.de";
 
+# openQA internal http server url
+our $OPENQA_HTTP_URL = "http://openqa.suse.de/assets/repo";
+
 # set flag IN_ZYPPER_CALL in zypper_call and unset when leaving
 our $IN_ZYPPER_CALL = 0;