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

Ensure that the branding packages are installed in the containers #332

Merged
merged 1 commit into from
Dec 21, 2023

Conversation

dirkmueller
Copy link
Member

No description provided.

Copy link
Collaborator

@dcermak dcermak left a comment

Choose a reason for hiding this comment

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

Do we really want to have these packages in the container? I really don't see the value add of a file with the contents:

SLE
VERSION = 15

That's just a worse /etc/os-release.

tests/test_all.py Outdated Show resolved Hide resolved
@dirkmueller dirkmueller force-pushed the check_branding branch 2 times, most recently from 3dce36c to 5583f43 Compare October 24, 2023 10:46
@dirkmueller dirkmueller marked this pull request as draft October 24, 2023 10:46
@dirkmueller dirkmueller force-pushed the check_branding branch 2 times, most recently from 4981986 to d36a75b Compare November 14, 2023 10:15
@dirkmueller dirkmueller force-pushed the check_branding branch 2 times, most recently from 51a383a to d3e6fd2 Compare December 5, 2023 12:12
@dirkmueller dirkmueller marked this pull request as ready for review December 5, 2023 16:40
@dirkmueller dirkmueller requested a review from dcermak December 5, 2023 16:40
)
def test_branding(container):
"""
check that the :file:`/etc/SUSE-brand` file exists and containers SLE branding
Copy link
Collaborator

Choose a reason for hiding this comment

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

Suggested change
check that the :file:`/etc/SUSE-brand` file exists and containers SLE branding
check that the :file:`/etc/SUSE-brand` file exists and contains the SLE branding

Comment on lines +107 to +110
if OS_VERSION == "tumbleweed":
branding = "openSUSE"
if OS_VERSION in ("basalt", "tumbleweed"):
location = "/usr/etc/SUSE-brand"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Why use these switches when the tests only run on Tumbleweed?

Copy link
Member Author

Choose a reason for hiding this comment

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

it also runs on 15.6 (and it did until recently basalt completely exploded) also on basalt. eventually I hope to be able to fix it also for older versions, so the skipif will reduce over time (famous last words)

@dcermak dcermak merged commit 83175ab into main Dec 21, 2023
131 of 135 checks passed
@dcermak dcermak deleted the check_branding branch December 21, 2023 13:08
rcmadhankumar pushed a commit that referenced this pull request Aug 30, 2024
Ensure that the branding packages are installed in the containers
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.

2 participants