Set proxySCC for offline media

os-autoinst · Mar 6, 2025 · d3aee86 · d3aee86
1 parent 0959880
commit d3aee86
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/lib/registration.pm b/lib/registration.pm
@@ -760,7 +760,9 @@ sub registration_bootloader_params {
     my ($max_interval) = @_;    # see 'type_string'
     $max_interval //= 13;
     my @params;
-    push @params, split ' ', registration_bootloader_cmdline;
+    if (get_var('SCC_URL') ne 'none') {
+        push @params, split ' ', registration_bootloader_cmdline;
+    }
     type_string "@params", $max_interval;
     save_screenshot;
     return @params;

diff --git a/tests/installation/bootloader_s390.pm b/tests/installation/bootloader_s390.pm
@@ -103,7 +103,9 @@ sub prepare_parmfile {
 
     $params .= specific_bootmenu_params;
     unless (get_var("AGAMA")) {
-        $params .= registration_bootloader_cmdline if check_var('SCC_REGISTER', 'installation');
+        if (get_var('SCC_URL') ne 'none') {
+            $params .= registration_bootloader_cmdline if check_var('SCC_REGISTER', 'installation');
+        }
     }
 
     # Pass autoyast parameter for s390x, shorten the url because of 72 columns limit in x3270 xedit

diff --git a/tests/installation/bootloader_zkvm.pm b/tests/installation/bootloader_zkvm.pm
@@ -50,7 +50,9 @@ sub set_svirt_domain_elements {
         $cmdline .= ' ' . get_var("EXTRABOOTPARAMS") if get_var("EXTRABOOTPARAMS");
         # inst.auto and inst.install_url are defined in 'specific_bootmenu_params'
         $cmdline .= specific_bootmenu_params;
-        $cmdline .= registration_bootloader_cmdline if check_var('SCC_REGISTER', 'installation') && !get_var('NTLM_AUTH_INSTALL');
+        if (get_var('SCC_URL') ne 'none') {
+            $cmdline .= registration_bootloader_cmdline if check_var('SCC_REGISTER', 'installation') && !get_var('NTLM_AUTH_INSTALL');
+        }
 
         $svirt->change_domain_element(os => initrd => "$zkvm_img_path/$name.initrd");
         $svirt->change_domain_element(os => kernel => "$zkvm_img_path/$name.kernel");