Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

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

Merged
merged 1 commit into from
Jul 18, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 5 additions & 2 deletions lib/registration.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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|containers|legacy|toolchain|web-scripting|public-cloud/) {
my @ver = split(/\./, scc_version());
add_suseconnect_product($name, $ver[0]);
}
Expand All @@ -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 {
tinawang123 marked this conversation as resolved.
Show resolved Hide resolved
next;
}
}
}

Expand Down
2 changes: 1 addition & 1 deletion tests/console/system_prepare.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')) {
tinawang123 marked this conversation as resolved.
Show resolved Hide resolved
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
Expand Down