Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Removes the base_product check from is_suma functions #396

Merged
merged 6 commits into from
Sep 19, 2024

Conversation

apozsuse
Copy link
Collaborator

Suma 5 payg images are not identified properly by the is_suma_server function, as the function was checking the baseproduct to be the Suma server one.

For Suma 5 images the baseproduct is the one for Micro, but the /etc/products.d contains also the suma-server one.

lrwxrwxrwx. 1 root root   14 sep 17 08:14 baseproduct -> SLE-Micro.prod
-rw-r--r--. 1 root root 1558 feb 28  2024 SLE-Micro.prod
-rw-r--r--. 1 root root 1939 ago 19 09:24 SUSE-Manager-Server.prod

This PR removes the baseproduct check in those functions and just leaves the file check for Suma server.

Copy link

@aosthof aosthof left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Except for the one comment this LGTM.

usr/share/lib/img_proof/tests/conftest.py Outdated Show resolved Hide resolved
@apozsuse apozsuse merged commit 19d1032 into main Sep 19, 2024
6 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants