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

Solves AlmaLinux/mirrors#1143 #1155

Merged
merged 2 commits into from
Dec 10, 2024

Conversation

soksanichenko
Copy link
Member

  • Check if SELinux is enabled during Ansible deploying
  • PEP8 (long lines, indents, typing etc.)
  • The unused import are removed, the rest imports are optimized
  • Get right major version if a full version is not listed in duplicated versions (the main issue)
  • Old field versions_arches is removed from the service config. Field arches provides the full compatibility with it

- Check if SELinux is enabled during Ansible deploying
- PEP8 (long lines, indents, typing etc.)
- The unused import are removed, the rest imports are optimized
- Get right major version if a full version is not listed in duplicated versions (the main issue)
- Old field `versions_arches` is removed from the service config. Field `arches` provides the full compatibility with it
utils.py Outdated
return True
elif version in versions_arches and arch in versions_arches[version]:
elif version in arches and arch in arches[version]:

Choose a reason for hiding this comment

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

Suggested change
elif version in arches and arch in arches[version]:
if arch in arches[version]:

We already made sure that version is in arches

utils.py Outdated
return True
elif version in versions_arches and arch in versions_arches[version]:
elif version in arches and arch in arches[version]:
return True
else:

Choose a reason for hiding this comment

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

No need for else. return False will do the same

duplicated_versions: dict[str, str] = field(default_factory=dict)
vault_versions: list[str] = field(default_factory=list)
versions_arches: dict[str, list[str]] = field(
Copy link
Member

Choose a reason for hiding this comment

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

Per our chat, this is fine for the 10-beta but it removes the ability to pin repo support between minor versions and architectures for optional modules. This will likely be needed for EPEL10 on v2 if we choose to rebuild it for v2 so we'll have to revisit this in the near future.

Copy link
Member

@jonathanspw jonathanspw left a comment

Choose a reason for hiding this comment

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

This one LGTM, about to work on the associated PR in https://github.com/AlmaLinux/mirrors/pull/1154/files

@jonathanspw jonathanspw merged commit 50efac3 into yaml_snippets Dec 10, 2024
@soksanichenko soksanichenko deleted the AlmaLinux/mirrors#1143/yaml_snippets branch December 12, 2024 13:43
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