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

Minor updates for Rocky and upgrade docker engine for CI #5552

Merged
merged 10 commits into from
Jan 28, 2022
Merged

Conversation

amanda11
Copy link
Contributor

@pull-request-size pull-request-size bot added the size/XS PR that changes 0-9 lines. Quick fix/merge. label Jan 24, 2022
@amanda11 amanda11 added the OS support Support/issues/PRs on a specific OS label Jan 24, 2022
@amanda11 amanda11 added this to the 3.7.0 milestone Jan 24, 2022
@@ -70,6 +70,7 @@ def get_linux_distribution():
re.search(distro, "Redhat")
or re.search(distro, "Fedora")
or re.search(distro, "CentOS Linux")
Copy link
Member

Choose a reason for hiding this comment

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

Not exactly related to this PR, but can we modify this to say CentOS instead of CentOS Linux? The stream releases won't match the current version, since platform.linux_distribution() for stream returns

platform.linux_distribution()
>> ('CentOS Stream', '8', '')

and the lsb_release way returns

→ lsb_release -i -s
CentOSStream

On CentOS 7, I guess this will still fail as well with Python >= 3.8

→ lsb_release -i -s
CentOS

Copy link
Member

Choose a reason for hiding this comment

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

I would be happy with that. Could you file a new PR?

@pull-request-size pull-request-size bot added size/S PR that changes 10-29 lines. Very easy to review. and removed size/XS PR that changes 0-9 lines. Quick fix/merge. labels Jan 28, 2022
auto-merge was automatically disabled January 28, 2022 10:09

Pull Request is not mergeable

@amanda11 amanda11 changed the title Minor updates for Rocky Minor updates for Rocky and upgrade docker engine for CI Jan 28, 2022
.circleci/config.yml Outdated Show resolved Hide resolved
Copy link
Member

@arm4b arm4b left a comment

Choose a reason for hiding this comment

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

Thanks @amanda11 ! 💯
Looks we're good now!

just added one more minor commit to sync up the CircleCI config with the upstream st2-packages version.

@amanda11 amanda11 merged commit e404cc8 into master Jan 28, 2022
@amanda11 amanda11 deleted the rocky_updates branch January 28, 2022 14:45
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
OS support Support/issues/PRs on a specific OS size/S PR that changes 10-29 lines. Very easy to review.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants