slapos_upgrader: rename broken resilient/import software types

master/bt5/slapos_upgrader/SkinTemplateItem/portal_skins/slapos_upgrader/InstanceTree_fixupSiteMigrationToVirtualMaster.py

@@ -98,6 +98,16 @@ while instance_to_check_list:
     # Check sub instances only if parent is ok
     instance_to_check_list.extend(instance.getSuccessorValueList())
 
+  elif (instance.getSourceReference() in ['resilient', 'kvm-resilient', 'import', 'kvm-import']):
+    # Do not migrate resiliency subinstances
+    # recreate the root instance, which does not contain user data, instead
+    # Do not expect webrunner to be allocated on another server. Skip 'runner-import'
+    instance_tree.setSuccessorValueList(instance_tree.getSuccessorValueList() + instance.getSuccessorValueList())
+    instance_to_check_list.extend(instance.getSuccessorValueList())
+    instance.setSuccessorValueList([])
+    # Do not destroy yet, to prevent any data deletion mistake
+    instance.SoftwareInstance_renameAndRequestStop()
+
 # Trigger migration
 for instance_virtual_master_relative_url in remote_virtual_master_dict:
   instance_tree_virtual_master.Project_checkSiteMigrationCreateRemoteNode(