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

[master] Merge 3006.x into master #65553

Merged
merged 322 commits into from
Dec 7, 2023
Merged

[master] Merge 3006.x into master #65553

merged 322 commits into from
Dec 7, 2023

Conversation

s0undt3ch
Copy link
Collaborator

What does this PR do?

See title

David Murphy and others added 30 commits November 14, 2023 16:53
@s0undt3ch
Added debug logic to determine correct value for test localhost on IPv6
6809e97
@s0undt3ch
Re-arranged the IPv6 localhost test and allowed for forms of Arch
903778d
@s0undt3ch
Allow for Photon returning the wrong thing for IPv4 localhost test
beea32d
@s0undt3ch
Update tests for salt/utils/network.py as per reviewer, and fix netma…
ac2beda 
…sk bug
@s0undt3ch
Updated test per reviewer comments
350f04e
@s0undt3ch
Updated for further reviewer comments
14fdf49
@s0undt3ch
Parameterize as per reviewer comments
8ffa213
@s0undt3ch
Further test refractoring from unittest to pytest per reviewer comments
c9c0ad0
@s0undt3ch
Ensure quoted filespec when using egrep to allow for regex with selinux
1bbe648
@s0undt3ch
Updated test per reviewer's comments
ee75a65
@dwoz @s0undt3ch
Upgrade relenv to 0.14.0
068c5e8
@dwoz @s0undt3ch
Relenv 0.14.1
84c6b70
@dwoz @s0undt3ch
Connect callback closes it's request channel
be5ef66
@dwoz @s0undt3ch
Use context manager for request channel
6615b5a
@dwoz @s0undt3ch
Fix test when using context manager is used
6e5a301
@dwoz @s0undt3ch
Use context manager to ensure channel is closed properly
2ddd5fc
@saltbot-open @s0undt3ch
Update the bootstrap script to v2023.11.07
551443c 
(cherry picked from commit 6531c36)
@s0undt3ch
Add a FIPS enabled test run under PhotonOS 4 to the CI process
02b147a 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Also run package tests under FIPS
3c76698 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Don't use separate jobs, just use the matrix
10e9e6c 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
More explicit variable name
d9a2ae0 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Use sha256 as the default hash_type. It has been the default …
3f3154e 
…since Salt v2016.9

Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Don't use hashlib.md5
3ed6e05 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Cannot currently create virtual environments on a FIPS enabled platforms
265ec5b 
See saltstack#65444

Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Replace md5 with sha256 for file checksum comparissons
47ace5b 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Remove unused variables
023b150 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Switch to sha256 as the hash_type
dc365fd 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Flush the logging handler just to be sure
c5db6bf 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Skip tests which can't run, or even pass on FIPS enabled platforms
066afb9 
Signed-off-by: Pedro Algarvio <[email protected]>
@s0undt3ch
Use -eq 0 instead of == 0 in shell script logic
a09afcb 
Signed-off-by: Pedro Algarvio <[email protected]>
@dwoz dwoz merged commit c9afe46 into saltstack:master Dec 7, 2023
783 of 788 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@dwoz dwoz dwoz approved these changes

@twangboy twangboy twangboy left review comments

@MKLeb MKLeb MKLeb left review comments

Assignees
No one assigned
Labels
test:full Run the full test suite test:pkg Run the package tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.