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

Fix --registry option (bsc#1226436) #367

Merged
merged 2 commits into from
Jun 18, 2024
Merged

Conversation

nadvornik
Copy link
Contributor

What does this PR change?

This PR fixes merging of a container image name with a registry specified separately.

Test coverage

  • No tests: manual testing

  • DONE

Links

https://bugzilla.suse.com/show_bug.cgi?id=1226436

  • DONE

Changelogs

Make sure the changelogs entries you are adding are compliant with https://github.com/uyuni-project/uyuni/wiki/Contributing#changelogs and https://github.com/uyuni-project/uyuni/wiki/Contributing#uyuni-projectuyuni-repository

If you don't need a changelog check, please mark this checkbox:

  • No changelog needed

If you uncheck the checkbox after the PR is created, you will need to re-run changelog_test (see below)

Before you merge

Check How to branch and merge properly!

@nadvornik nadvornik marked this pull request as draft June 18, 2024 13:03
Copy link
Member

@mbussolotto mbussolotto left a comment

Choose a reason for hiding this comment

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

I'm not sure what can happen if Registry is empty (I think this is not the case for suma but it should be for uyuni).
If everything for suma and uyuni works fine without provide --registry (or pass registry in /etc/uyuni/uyuni-tools ) is ok for me

@nadvornik
Copy link
Contributor Author

I have adjusted the unit test - IMO it is not correct to expect that the path in the alternative registry is the same (see the bug)

Empty registry works OK - the condition !strings.Contains(imageFlags.Name, imageFlags.Registry) is not triggered.

@nadvornik nadvornik marked this pull request as ready for review June 18, 2024 13:20
Copy link
Member

@mbussolotto mbussolotto left a comment

Choose a reason for hiding this comment

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

LGTM

@admd admd merged commit ecfca85 into uyuni-project:main Jun 18, 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.

3 participants