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.

Sign up for GitHub

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

Jump to bottom

add linux_distribution to util #63914

Closed
wants to merge 56 commits into from
Closed

add linux_distribution to util #63914

wants to merge 56 commits into from

Conversation

cmcmarrow
Copy link
Contributor

@cmcmarrow cmcmarrow commented Mar 20, 2023 •
edited
Loading

What does this PR do?

add util linx_osinfo to stop dep warrning

What issues does this PR fix or reference?

Fixes: #63904

Previous Behavior

used the dep function distro.linux_distribution()

New Behavior

Move to distro.id(), distro.version() and distro.name()

Merge requirements satisfied?

Commits signed with GPG?

Yes

s0undt3ch and others added 30 commits March 6, 2023 13:05
@s0undt3ch
Fix dictionary key typo
7cf39d8 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Drop Python 3.6 requirements files
4557dd0 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Stop running tests on Jenkins, with the exception of the cloud tests
2dbdea9 
Signed-off-by: Pedro Algarvio <[email protected]>
Update ssl shared object locations
b644e2d
Add check for leftover old file locations when installing the packages
a3293af
@s0undt3ch
Trigger schedule(nightly) builds on non default branches
01a465f 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Default to not running scheduled builds on forks.
d64b74f 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Allow jobs on forks which have self hosted runners setup.
2e3b27e 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Try to get the VM environment from the instance tags
fe440b5 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Switch to using our onedir to run the package tests
f158710 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Remove nox sessions and requirements files which are no longer necessary
98a5635 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Fix the bash comparisson
bd7bdd2 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Use requests to download files
cbbcebd 
Signed-off-by: Pedro Algarvio <[email protected]>
@dwoz @s0undt3ch
Remove un-needed 'scripts' property in setup.py
6b94638
@twangboy @s0undt3ch
Add back ssm.exe. It is needed for VMtools
1d6379a
@MKLeb
Merge branch 'master' into hotfix/salt-run-in-spec-file
2fbb30b
porting saltstack#63836 to master
a34899f
@twangboy @s0undt3ch
Timestamp files to match git commit
ec8ab6d
Fix rpm_lowpkg version comparison logic when using rpm-vercmp
4f5435b
Move the expected assertions to the correct place
ebfdf66
@garethgreenaway
Merge pull request saltstack#63851 from whytewolf/salt-api_errors_master
365aa66 
porting saltstack#63836 to master
Add documentation for onedir builds
dafba12
Implement requested feedback
903c1b4
Implement Review Feedback
b4ddd26
@s0undt3ch
Only de-select build-source-tarball if build-docs is also False
3db7d31 
Signed-off-by: Pedro Algarvio <[email protected]>
Remove # in bash commands
f49a881
@garethgreenaway
Merge pull request saltstack#63858 from Ch3LL/master_fix-rpm-ver
30570ad 
Port saltstack#63849 to master
@garethgreenaway
Merge pull request saltstack#63859 from Ch3LL/master_update_pkg_docs
b0eb60f 
Port saltstack#63832 to master
@garethgreenaway
Merge pull request saltstack#63842 from MKLeb/hotfix/salt-run-in-spec…
98b151a 
…-file

Update ssl shared object locations
@garethgreenaway @s0undt3ch
Fixing inotify example in the beacons documentation.
7ecaca5
s0undt3ch and others added 12 commits March 17, 2023 12:43
@s0undt3ch
Merge 3006.x into master
5792686
@s0undt3ch
Merge pull request saltstack#63865 from s0undt3ch/hotfix/merge-forward
abc5d29 
Merge 3006.x into master
@s0undt3ch
Better handling of exception
56ac61a 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
We no longer have to pass --rc-build
ff921f9 
That can be inferred from the passed salt version.

Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Promote from staging to release based on a list of files instead of s…
3133b46 
…earching

Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Don't delete the .release-backup-done file
c9c1e24 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Query the GH Api authenticated if GITHUB_TOKEN env variable is avai…
3fe729c 
…lable

Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
For release it's an argument, not a flag
8ac339f 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Don't trigger scheduled jobs if requirements were not met
778d4f4 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Merge 3006.x into master
73c1289
@s0undt3ch
Merge pull request saltstack#63908 from s0undt3ch/hotfix/merge-forward
b6b6ccd 
Merge 3006.x into master
@cmcmarrow
add linx osinfo
fb18e50
@cmcmarrow cmcmarrow requested a review from a team as a code owner March 20, 2023 21:04
@cmcmarrow cmcmarrow requested review from Ch3LL and removed request for a team March 20, 2023 21:04
@cmcmarrow cmcmarrow added this to the Sulfur v3006.0 milestone Mar 20, 2023
@cmcmarrow cmcmarrow added Documentation Relates to Salt documentation and removed Documentation Relates to Salt documentation labels Mar 20, 2023
s0undt3ch
s0undt3ch suggested changes Mar 20, 2023
View reviewed changes
Copy link
Collaborator

@s0undt3ch s0undt3ch left a comment

Choose a reason for hiding this comment

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

Let's implement linux_distribution in salt/utils/platform.py since it previously already imported linux_distribution from distro.

salt/utils/platform.py Outdated Show resolved Hide resolved
salt/version.py Outdated Show resolved Hide resolved
salt/grains/core.py Outdated Show resolved Hide resolved
@cmcmarrow cmcmarrow changed the title add linx osinfo add linux_distribution to util Mar 21, 2023
s0undt3ch
s0undt3ch previously approved these changes Mar 21, 2023
View reviewed changes
@s0undt3ch s0undt3ch changed the base branch from master to 3006.x March 21, 2023 04:35
@s0undt3ch s0undt3ch dismissed their stale review March 21, 2023 04:35

The base branch was changed.

@s0undt3ch
Copy link
Collaborator

Lets just rebase this PR against 3006.x, I already changed the branch here on the PR, but it can't be rebased automatically.

@cmcmarrow cmcmarrow closed this Mar 21, 2023
@cmcmarrow cmcmarrow removed this from the Sulfur v3006.0 milestone Mar 21, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@s0undt3ch s0undt3ch s0undt3ch left review comments

@Ch3LL Ch3LL Awaiting requested review from Ch3LL Ch3LL was automatically assigned from saltstack/team-core

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

[3006][RC1][BUG] salt -V , a deprecation warning is shown.
8 participants
@cmcmarrow @s0undt3ch @dwoz @twangboy @MKLeb @garethgreenaway @dafyddj @dehnert