@@ -215,8 +215,8 @@ def _handle_transaction_err_msg_size(err):
215215
216216
217217def enable_spacewalk_module (context ):
218- enabled_repos = ["cloudlinux8-baseos" ]
219218 target_major_version = get_target_major_version ()
219+ enabled_repos = ["cloudlinux{version}-baseos" .format (version = target_major_version )]
220220 repos_opt = [['--enablerepo' , repo ] for repo in enabled_repos ]
221221 repos_opt = list (itertools .chain (* repos_opt ))
222222
@@ -260,8 +260,13 @@ def prepare_target_userspace(context, userspace_dir, enabled_repos, packages):
260260 _import_gpg_keys (context , install_root_dir , target_major_version )
261261
262262 api .current_logger ().debug ('Installing cloudlinux-release' )
263- context .call (['rpm' , '--import' , 'https://repo.cloudlinux.com/cloudlinux/security/RPM-GPG-KEY-CloudLinux' ], callback_raw = utils .logging_handler )
264- context .call (['dnf' , '-y' , 'localinstall' , 'https://repo.cloudlinux.com/cloudlinux/migrate/release-files/cloudlinux/8/x86_64/cloudlinux8-release-current.x86_64.rpm' ], callback_raw = utils .logging_handler )
263+ context .call (['rpm' , '--import' , 'https://repo.cloudlinux.com/cloudlinux/security/RPM-GPG-KEY-CloudLinux' ],
264+ callback_raw = utils .logging_handler )
265+ cloudlinux_release_url = 'https://repo.cloudlinux.com/cloudlinux/migrate/release-files' \
266+ '/cloudlinux/{version}/x86_64/cloudlinux{version}-release-current.x86_64.rpm' \
267+ '' .format (version = target_major_version )
268+ context .call (['dnf' , '-y' , 'localinstall' , cloudlinux_release_url ],
269+ callback_raw = utils .logging_handler )
265270
266271 enable_spacewalk_module (context )
267272
0 commit comments