After migration, do re-register only for some particular modules

os-autoinst · Jul 18, 2019 · 4547b52 · 4547b52
1 parent 33bb731
commit 4547b52
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/lib/registration.pm b/lib/registration.pm
@@ -198,7 +198,7 @@ sub register_addons_cmd {
     my @addons = grep { defined $_ && $_ } split(/,/, $addonlist);
     foreach my $addon (@addons) {
         my $name = get_addon_fullname($addon);
-        if ($name =~ /module/) {
+        if ($name =~ /adv/ || $name =~ /containers/ || $name =~ /legacy/ || $name =~ /toolchain/ || $name =~ /web-scripting/) {
             my @ver = split(/\./, scc_version());
             add_suseconnect_product($name, $ver[0]);
         }
@@ -211,9 +211,12 @@ sub register_addons_cmd {
         elsif ($name =~ /LTSS/) {
             add_suseconnect_product($name, undef, undef, "-r " . get_var('SCC_REGCODE_LTSS'));
         }
-        else {
+        elsif ($name =~ /sdk/) {
             add_suseconnect_product($name);
         }
+        else {
+            next;
+        }
     }
 }
 

diff --git a/tests/console/system_prepare.pm b/tests/console/system_prepare.pm
@@ -42,7 +42,7 @@ sub run {
     # Register the modules after media migration, only for sle<15
     # poo#54131 [SLE][Migration][SLE12SP5]test fails in system_prepare -
     # media upgrade need add modules after migration
-    if (get_var('SCC_ADDONS') && is_sle('<15') && get_var('MEDIA_UPGRADE')) {
+    if (get_var('SCC_ADDONS') && is_sle('<15') && get_var('MEDIA_UPGRADE') && get_var('KEEP_REGISTERED')) {
         assert_script_run 'SUSEConnect --url ' . get_required_var('SCC_URL') . ' -r ' . get_required_var('SCC_REGCODE');
         my $myaddons = get_var('SCC_ADDONS');
         # After media upgrade, system don't include ltss extension