From f8c14019751b7df71970d8b8b285de2e6732d20e Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Thu, 7 Nov 2024 09:29:07 +0100 Subject: [PATCH 1/2] fix compliance check as some packages were renamed --- uyuni/uyuni-payg-timer/uyuni-payg-extract-data.py | 7 ++++--- ...-timer.changes.mc.Manager-5.0-MU-5.0.2-fix-payg-pkglist | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 uyuni/uyuni-payg-timer/uyuni-payg-timer.changes.mc.Manager-5.0-MU-5.0.2-fix-payg-pkglist diff --git a/uyuni/uyuni-payg-timer/uyuni-payg-extract-data.py b/uyuni/uyuni-payg-timer/uyuni-payg-extract-data.py index b0b5ebfac8f5..2eed52887d65 100644 --- a/uyuni/uyuni-payg-timer/uyuni-payg-extract-data.py +++ b/uyuni/uyuni-payg-timer/uyuni-payg-extract-data.py @@ -235,12 +235,13 @@ def perform_compliants_checks(): check_pkgs = [ "python-instance-billing-flavor-check", "csp-billing-adapter-service", - "python3-csp-billing-adapter-local", + "python311-csp-billing-adapter", + "python311-csp-billing-adapter-local", ] if cloudProvider == "AWS": - check_pkgs.append("python3-csp-billing-adapter-amazon") + check_pkgs.append("python311-csp-billing-adapter-amazon") elif cloudProvider == "AZURE": - check_pkgs.append("python3-csp-billing-adapter-microsoft") + check_pkgs.append("python311-csp-billing-adapter-microsoft") modified_packages = any(has_package_modifications(pkg) for pkg in check_pkgs) diff --git a/uyuni/uyuni-payg-timer/uyuni-payg-timer.changes.mc.Manager-5.0-MU-5.0.2-fix-payg-pkglist b/uyuni/uyuni-payg-timer/uyuni-payg-timer.changes.mc.Manager-5.0-MU-5.0.2-fix-payg-pkglist new file mode 100644 index 000000000000..6d565e42c97a --- /dev/null +++ b/uyuni/uyuni-payg-timer/uyuni-payg-timer.changes.mc.Manager-5.0-MU-5.0.2-fix-payg-pkglist @@ -0,0 +1 @@ +- fix compliance check as some packages were renamed (bsc#1233014) From bed968fcf3b1de0fdcd901ebae67ce139fd7f173 Mon Sep 17 00:00:00 2001 From: Michael Calmer Date: Thu, 7 Nov 2024 10:22:10 +0100 Subject: [PATCH 2/2] rename packages also in supportconfig --- ...nager.changes.mc.Manager-5.0-MU-5.0.2-fix-payg-pkglist | 1 + .../supportutils-plugin-susemanager/susemanager | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) create mode 100644 susemanager-utils/supportutils-plugin-susemanager/supportutils-plugin-susemanager.changes.mc.Manager-5.0-MU-5.0.2-fix-payg-pkglist diff --git a/susemanager-utils/supportutils-plugin-susemanager/supportutils-plugin-susemanager.changes.mc.Manager-5.0-MU-5.0.2-fix-payg-pkglist b/susemanager-utils/supportutils-plugin-susemanager/supportutils-plugin-susemanager.changes.mc.Manager-5.0-MU-5.0.2-fix-payg-pkglist new file mode 100644 index 000000000000..d1e34ac306fd --- /dev/null +++ b/susemanager-utils/supportutils-plugin-susemanager/supportutils-plugin-susemanager.changes.mc.Manager-5.0-MU-5.0.2-fix-payg-pkglist @@ -0,0 +1 @@ +- change supportconfig as some packages were renamed (bsc#1233014) diff --git a/susemanager-utils/supportutils-plugin-susemanager/susemanager b/susemanager-utils/supportutils-plugin-susemanager/susemanager index 2e499786168a..4770282e81b6 100755 --- a/susemanager-utils/supportutils-plugin-susemanager/susemanager +++ b/susemanager-utils/supportutils-plugin-susemanager/susemanager @@ -96,12 +96,12 @@ if [ -x /usr/bin/instance-flavor-check ]; then validate_rpm "python-instance-billing-flavor-check" validate_rpm "billing-data-service" validate_rpm "csp-billing-adapter-service" - validate_rpm "python3-csp-billing-adapter" - validate_rpm "python3-csp-billing-adapter-local" - validate_rpm "python3-csp-billing-adapter-amazon" + validate_rpm "python311-csp-billing-adapter" + validate_rpm "python311-csp-billing-adapter-local" + validate_rpm "python311-csp-billing-adapter-amazon" validate_rpm "suma-amazon-adapter-config-llc" validate_rpm "suma-amazon-adapter-config-ltd" - validate_rpm "python3-csp-billing-adapter-azure" + validate_rpm "python311-csp-billing-adapter-azure" validate_rpm "suma-azure-adapter-config-llc" validate_rpm "suma-azure-adapter-config-ltd" else