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 forward 3007.x into master #66691

Merged
merged 184 commits into from
Aug 19, 2024
Merged

[master] Merge forward 3007.x into master #66691

merged 184 commits into from
Aug 19, 2024

Conversation

dwoz
Copy link
Contributor

@dwoz dwoz commented Jul 5, 2024

Merge forward 3007.x into master.

hurzhurz and others added 30 commits April 26, 2024 09:54
@hurzhurz
fix wintask.info: ExecutionTimeLimit and unknown values
c2a6550 
ExecutionTimeLimit: can be nothing or "PT0S" if not used
_reverse_lookup: if not found, return "invalid value" instead of the last dict element
@hurzhurz
fix win_task result and error code interpretation
cf63bb3 
correct high result/error code numbers that are returned as negative numbers by win32com.
handle unknown LastTaskResult result codes.
@hurzhurz
add tests
de651d6
@hurzhurz
add changelog
3baaf79
@ScriptAutomate @dwoz
Simplify CODEOWNERS file for PR management
eb817ac
@ScriptAutomate
Migrate to new internal pypi proxy
38faa68
@twangboy
Merge pull request saltstack#66601 from ScriptAutomate/pypi-index-mig…
99e158f 
…ration

[3006.x] Migrate to new internal pypi proxy
@dwoz
WIP - Handling GitFS locking issue and resource loss due to SIGTERM n…
1290f93 
…ot clearing up
@dwoz
Fix for GitFS failure to unlock lock file, and resource cleanup for p…
d58a689 
…rocess SIGTERM, tests to be done
@dwoz
Updated gitfs tests for machine identifier
563556e
@dwoz
Moved get_machine_identifier temporiarly till sorted where it will be…
0206162 
… and what
@dwoz
Fix up use of get_machine_identifer
0ba93f8
@dwoz
Fix missing typo f-string
2a532aa
@dwoz
Updated format to f-string, and adjusted error messages to match tests
1b6e964
@dwoz
Initial port from unittest to pytest of unit/utils/test_gitfs.py to t…
40d5a25 
…est_gitfs_locks.py
@dwoz
[WIP] Almost working port from unit test to pytest, contains debugging
3d2c111
@dwoz
Working tests ported from unittest to pytest
ec549d6
@dwoz
Testing additional test
f832181
@dwoz
Tests for gen_lock functionality
9c80258
@dwoz
Initial SIGTERM testing
ee55b9a
@dwoz
WIP - Test kill cleanup of resources
443fdd3
@dwoz
WIP Test for kill SIGTERM
56a11ba
@dwoz
Working test for SIGTERM of held lock
2265376
@dwoz
Updated SIGTERM test, and additional tests, and cleanup
c982cbd
@dwoz
Updated to use grains/core.py get_machine_id for machine identifier
695353e
@dwoz
Cleaned up tests and removal of debug statements
21cf213
@dwoz
Removed commented out debug code
3716422
@dwoz
Moved location for finding machine_id to salt utils files, and had gr…
f98b707 
…ains import from there
@dwoz
Ensured use of get_machine_identifier from salt.utils.files for ident…
0de790c 
…ifying a machine id
@dwoz
Allow for machine_id key when getting the machine_identifier
8fb0127
@dwoz
Fix grains test on FIPS platforms
17c58d6 
Also, clean up pre-commit
@dwoz dwoz requested a review from twangboy August 17, 2024 21:44
@dwoz dwoz merged commit 246d066 into saltstack:master Aug 19, 2024
823 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@twangboy twangboy twangboy approved these changes

Assignees

@dwoz dwoz

Labels
test:full Run the full test suite test:os:all Run Tests Against ALL OS'es test:pkg Run the package tests
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.