diff --git a/0044-Setup-3rd-repo-available-if-some-pkg-installed-from-.patch b/0044-Setup-3rd-repo-available-if-some-pkg-installed-from-.patch new file mode 100644 index 0000000000000000000000000000000000000000..c3e8eeaa19e0d131db530a159609635379d51ff3 --- /dev/null +++ b/0044-Setup-3rd-repo-available-if-some-pkg-installed-from-.patch @@ -0,0 +1,62 @@ +From 8f39187682681f8687fcb8692c4677abf7195297 Mon Sep 17 00:00:00 2001 +From: ZhouWeitao +Date: Wed, 17 May 2023 17:06:29 +0800 +Subject: [PATCH] Setup 3rd repo available if some pkg installed from 3rd repo. + +Signed-off-by: ZhouWeitao +--- + .../el7toel8/actors/setup3rdrepos/actor.py | 42 ++++++++++++++++++++++ + 1 file changed, 42 insertions(+) + create mode 100644 repos/system_upgrade/el7toel8/actors/setup3rdrepos/actor.py + +diff --git a/repos/system_upgrade/el7toel8/actors/setup3rdrepos/actor.py b/repos/system_upgrade/el7toel8/actors/setup3rdrepos/actor.py +new file mode 100644 +index 0000000..a983e6e +--- /dev/null ++++ b/repos/system_upgrade/el7toel8/actors/setup3rdrepos/actor.py +@@ -0,0 +1,42 @@ ++import platform ++ ++from leapp.actors import Actor ++from leapp.libraries.common import repofileutils ++from leapp.libraries.common.rpms import has_package ++from leapp.models import (CustomTargetRepository, CustomTargetRepositoryFile, InstalledUnsignedRPM) ++from leapp.tags import FactsPhaseTag, IPUWorkflowTag ++ ++CANDIDATE_REPOS = ['nodesource', 'zabbix', 'zabbix-frontend'] ++ ++class Setup3rdRepos(Actor): ++ """ ++ Setup 3rd repositories available if there is pkg installed from 3rd repo. ++ """ ++ ++ name = 'setup3rdrepos' ++ consumes = (CustomTargetRepositoryFile, InstalledUnsignedRPM) ++ produces = (CustomTargetRepository,) ++ tags = (IPUWorkflowTag, FactsPhaseTag) ++ ++ def process(self): ++ repos_3rd = set() ++ for rpm_pkgs in self.consume(InstalledUnsignedRPM): ++ for pkg in rpm_pkgs.items: ++ if pkg.repository in CANDIDATE_REPOS: ++ repos_3rd.add(pkg.repository) ++ ++ custom_repos_map = {} ++ for ctrf in self.consume(CustomTargetRepositoryFile): ++ repofile = repofileutils.parse_repofile(ctrf.file) ++ for repo in repofile.data: ++ custom_repos_map[repo.repoid] = repo ++ ++ for repo in repos_3rd: ++ repoid = repo + '-migrate' ++ if repoid in custom_repos_map.keys(): ++ self.produce(CustomTargetRepository( ++ repoid=custom_repos_map[repoid].repoid, ++ name=custom_repos_map[repoid].name, ++ baseurl=custom_repos_map[repoid].baseurl, ++ enabled=True, ++ )) +-- +1.8.3.1 + diff --git a/leapp-repository.spec b/leapp-repository.spec index 20eead2f7262240141052b3168940d15ded8b4c5..fa632b5d8c60295585ca717048498f397f193817 100644 --- a/leapp-repository.spec +++ b/leapp-repository.spec @@ -11,7 +11,7 @@ }\ py2_byte_compile "%1" "%2"} -%define anolis_release 22 +%define anolis_release 23 Name: leapp-repository Version: 0.13.0 @@ -69,6 +69,7 @@ Patch40: 0040-Fix-colloecting-virtio-nic-info-error.patch Patch41: 0041-Add-python-devel-version-check-and-update.patch Patch42: 0042-Report-inhibitor-message-to-SMC.patch Patch43: 0043-Fix-the-memory-unit-error.patch +Patch44: 0044-Setup-3rd-repo-available-if-some-pkg-installed-from-.patch BuildArch: noarch BuildRequires: python-devel @@ -196,6 +197,9 @@ done; # no files here %changelog +* Wed May 17 2023 Weitao Zhou - 0.13.0-2.23 +- Support nodesource, zabbix 3rd repos migrate + * Fri May 12 2023 wangzhe - 0.13.0-2.22 - Fix the memory unit error diff --git a/leapp_upgrade_repositories.repo b/leapp_upgrade_repositories.repo index c2ebbc0c5a9855d65a5758cd95c10b82e1460ca0..944737c29e3baa5f6cf77d63e63d8cdf3a9f466c 100644 --- a/leapp_upgrade_repositories.repo +++ b/leapp_upgrade_repositories.repo @@ -66,3 +66,18 @@ baseurl=http://mirrors.openanolis.cn/anolis/8/Extras/$basearch/debug enabled=0 gpgcheck=0 +[nodesource-migrate] +name=Node.js Packages for Enterprise Linux 8 - $basearch +baseurl=https://rpm.nodesource.com/pub_18.x/el/8/$basearch +module_hotfixes=true +failovermethod=priority +enabled=0 +gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/NODESOURCE-GPG-SIGNING-KEY-EL + +[zabbix-migrate] +name=Zabbix Official Repository - $basearch +baseurl=http://repo.zabbix.com/zabbix/5.0/rhel/8/$basearch/ +enabled=0 +gpgcheck=0 +gpgkey=file:///etc/pki/rpm-gpg/RPM-GPG-KEY-ZABBIX-A14FE591