Merge pull request #20756 from hjluo/fix_ay_smt

Fix SMT autoyast profile for 15sp7 spvm
os-autoinst · Dec 10, 2024 · fc97a31 · fc97a31
2 parents 7caabae + 019860a
commit fc97a31
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/data/yam/autoyast/create_hdd_migration_ppc64le.xml.ep b/data/yam/autoyast/create_hdd_migration_ppc64le.xml.ep
@@ -4,6 +4,9 @@
   <suse_register>
     <do_registration config:type="boolean">true</do_registration>
     <reg_code><%= $get_var->('SCC_REGCODE') %></reg_code>
+    % if ($check_var->('SCC_URL', 'none') or $check_var->('SCC_URL', "")) {
+        <reg_server><%= $get_var->('SMT_URL') %></reg_server>
+    % }
     <install_updates config:type="boolean">true</install_updates>
     % if (keys %$addons) {
     <addons config:type="list">

diff --git a/tests/migration/online_migration/yast2_migration.pm b/tests/migration/online_migration/yast2_migration.pm
@@ -218,7 +218,14 @@ sub run {
         # gpg keys; Same with leap to sle migration, need to trust packagehub gpg key.
         if (get_var('SMT_URL') =~ /smt/) {
             assert_screen 'import-untrusted-gpg-key', 180;
-            send_key 'alt-t';
+            # for 15-SP7 yast2 migration with smt, we need to choose Again and Yes.
+            if (is_sle('15-SP7+')) {
+                send_key 'alt-a';
+                send_key 'alt-y';
+            }
+            else {
+                send_key 'alt-t';
+            }
             if ((is_x86_64) && (!(is_leap_migration)) || (is_aarch64)) {
                 assert_screen 'import-untrusted-gpg-key-nvidia', 300;
                 send_key 'alt-t';