switch cln channel version according to target os version

Author: Monstrofil

repos/system_upgrade/cloudlinux/actors/switchclnchanneldownload/actor.py

@@ -9,6 +9,7 @@
 from leapp.libraries.common.cln_switch import cln_switch, get_target_userspace_path
 from leapp import reporting
 from leapp.reporting import Report
+from leapp.libraries.common.config.version import get_target_major_version
 
 
 
@@ -29,7 +30,7 @@ class SwitchClnChannelDownload(Actor):
     @run_on_cloudlinux
     def process(self):
         try:
-            cln_switch(target=8)
+            cln_switch(target=int(get_target_major_version()))
         except CalledProcessError as e:
             reporting.create_report(
                 [

repos/system_upgrade/cloudlinux/actors/switchclnchannelreset/actor.py

@@ -4,6 +4,7 @@
 from leapp.libraries.stdlib import CalledProcessError
 from leapp.libraries.common.cllaunch import run_on_cloudlinux
 from leapp.libraries.common.cln_switch import cln_switch
+from leapp.libraries.common.config.version import get_source_major_version
 from leapp import reporting
 from leapp.reporting import Report
 
@@ -21,12 +22,12 @@ class SwitchClnChannelReset(Actor):
     @run_on_cloudlinux
     def process(self):
         try:
-            cln_switch(target=7)
+            cln_switch(target=get_source_major_version())
         except CalledProcessError as e:
             reporting.create_report(
                 [
                     reporting.Title(
-                        "Failed to switch CloudLinux Network channel from to 7."
+                        "Failed to switch CloudLinux Network channel."
                     ),
                     reporting.Summary(
                         "Command {} failed with exit code {}."

repos/system_upgrade/common/actors/targetuserspacecreator/libraries/userspacegen.py

@@ -340,7 +340,7 @@ def prepare_target_userspace(context, userspace_dir, enabled_repos, packages):
         # transaction check phase is done - so the preupgrade checks won't affect the host system.
         # The 'switch_cln_channel_download' actor should take care of switching the channel back to the CL8 channel
         # when it's time to download the upgrade packages.
-        cln_switch(target=8)
+        cln_switch(target=int(get_target_major_version()))
 
 
 def _query_rpm_for_pkg_files(context, pkgs):