Move remove-ltss before deregister system

os-autoinst · Jul 26, 2018 · 55c9b8f · 55c9b8f
1 parent 19a86b8
commit 55c9b8f
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/products/sle/main.pm b/products/sle/main.pm
@@ -659,7 +659,6 @@ sub load_patching_tests {
         if (get_var('LOCK_PACKAGE') && !installzdupstep_is_applicable) {
             loadtest 'console/lock_package';
         }
-        loadtest 'migration/remove_ltss';
         loadtest 'migration/record_disk_info';
         # Reboot from DVD and perform upgrade
         loadtest "migration/reboot_to_upgrade";
@@ -1099,7 +1098,6 @@ else {
         load_default_autoyast_tests;
         # Load this to perform some other actions before upgrade even though registration and patching is controlled by autoyast
         loadtest 'update/patch_sle';
-        loadtest 'migration/remove_ltss';
         loadtest 'migration/record_disk_info';
         loadtest "migration/version_switch_upgrade_target";
         load_default_tests;

diff --git a/tests/migration/sle12_online_migration/register_without_ltss.pm b/tests/migration/sle12_online_migration/register_without_ltss.pm
@@ -20,7 +20,6 @@ sub run {
     select_console 'root-console';
 
     scc_deregistration(version_variable => 'HDDVERSION');
-    remove_ltss;
 
     # Re-register system without LTSS with resetting SCC_ADDONS variable without ltss
     my @scc_addons = split(/,/, get_var('SCC_ADDONS', ''));

diff --git a/tests/migration/sle12_online_migration/zypper_patch.pm b/tests/migration/sle12_online_migration/zypper_patch.pm
@@ -24,6 +24,7 @@ sub run {
 
     add_test_repositories;
     fully_patch_system;
+    remove_ltss;
     type_string "reboot\n";
     $self->wait_boot(textmode => !is_desktop_installed, ready_time => 600);
     $self->setup_migration;

diff --git a/tests/update/patch_sle.pm b/tests/update/patch_sle.pm
@@ -72,7 +72,9 @@ sub patching_sle {
 
     # Remove test repos after system being patched
     remove_test_repositories;
-
+
+    #migration with LTSS is not possible, remove it before upgrade 
+    remove_ltss; 
     if (get_var('FLAVOR', '') =~ /-(Updates|Incidents)$/ || get_var('KEEP_REGISTERED')) {
         # The system is registered.
         set_var('HDD_SCC_REGISTERED', 1);