Skip to content

Merge forward 3006.x into 3007.x #68758

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

Merged
dwoz merged 61 commits into from
Mar 13, 2026
+19,422 −6,391
Merged

Merge forward 3006.x into 3007.x #68758

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
61 commits
Select commit Hold shift + click to select a range
c7153d8
Update relenv to 0.22.4
twangboy Feb 18, 2026
d44dc05
Windows has slightly different paths
twangboy Feb 19, 2026
7ee0791
Fix formatting and put it back on common
twangboy Feb 20, 2026
a5aa3be
Move linux back to dir_patterns
twangboy Feb 20, 2026
6dd925b
Update virtualenv embedded wheels manually
twangboy Feb 20, 2026
a0ff328
Update the __init__.py file
twangboy Feb 20, 2026
5086e2f
Fix some lint
twangboy Feb 20, 2026
55f52a6
Fix pre-commit
twangboy Feb 20, 2026
e2e8e5e
Fix SyntaxWarning for invalid escape sequence in tornado/util.py
AhmadYasser1 Feb 9, 2026
6e3c7dc
Upgrade cryptography
dwoz Feb 19, 2026
05bc87d
Fix whl file filter
dwoz Feb 19, 2026
58559ca
Accept maturin binary for now
dwoz Feb 19, 2026
512b048
Test fixes
dwoz Feb 19, 2026
03f62f6
Fix crypto tests
dwoz Feb 20, 2026
41f942b
Update vcert
dwoz Feb 20, 2026
4779d9a
Multiple test fixes
dwoz Feb 20, 2026
7629d30
Test fixes
dwoz Feb 20, 2026
24c39d3
Wait for minions to stop, then be aggressive
dwoz Feb 20, 2026
c44b874
Windows upgrade fix
dwoz Feb 20, 2026
776f7bd
Revert pkg cleanup rule that did not work
dwoz Feb 20, 2026
68169f6
More agressive process termination
dwoz Feb 20, 2026
66b0acc
Kill processes if needed
dwoz Feb 20, 2026
b1bd692
Fix downgrade
dwoz Feb 21, 2026
dab3cfe
Release v3006.22
saltbot-open Feb 21, 2026
ca3621f
Merge branch '3006.x' into merge/3006.x/3007.x-25-02-21
dwoz Feb 22, 2026
6db20eb
Fix merge warts
dwoz Feb 22, 2026
d97ddc4
Install VCRedist on 3006.x
twangboy Feb 23, 2026
ae106af
Release v3006.23
saltbot-open Feb 23, 2026
06600ff
Use uv instead of pip-compile
dwoz Feb 22, 2026
7f324a0
Fix requirement versions to match 3006.x
dwoz Feb 23, 2026
3a44ac4
Update apache-libcloud version
dwoz Feb 23, 2026
3af5565
Consolidate pre-commit and constraints configuration
dwoz Feb 24, 2026
6f1e9ac
Account for Zombies
dwoz Feb 25, 2026
e861bee
Account for psutil upgrade
dwoz Feb 25, 2026
744daf2
Test fixes
dwoz Feb 25, 2026
1288d2c
Windows test fixes
dwoz Feb 25, 2026
7ddd0d0
Remove debug logging
dwoz Feb 25, 2026
5818b96
Remove unwanted file
dwoz Feb 25, 2026
5bd4e1e
Add documentation and some tools for ai agents
dwoz Feb 25, 2026
4c328b7
Merge branch '3006.x' into 3007.x
dwoz Feb 25, 2026
e10efad
Fix merge wart
dwoz Feb 25, 2026
5e37290
Merge branch '3006.x' into merge/3006.x/3007.x-25-02-21
dwoz Feb 25, 2026
617d28f
Fix pymssql version: pin to 2.3.11 instead of non-existent 2.3.13
dwoz Feb 26, 2026
851aa83
Move container defs to cicd directory
dwoz Feb 15, 2026
c9dfaea
Fix macos runner names
dwoz Feb 19, 2026
e002fbc
Consolidate queue locking
dwoz Feb 26, 2026
ad45d0d
Handle edge cases
dwoz Feb 26, 2026
9ec1f26
Refactor tests
dwoz Feb 27, 2026
2f2a793
Use consolidated salt_queues.lock for both queue operations
dwoz Feb 27, 2026
76adc97
Refactor broken tests
dwoz Feb 28, 2026
d82de39
Ensure we use the proper lock file
dwoz Feb 28, 2026
9a47c36
Update ansible/ansible-core
twangboy Feb 25, 2026
f5bbfff
Update werkzeug and sqlparse
twangboy Feb 24, 2026
4c99d7a
Fix test_mysql test
twangboy Feb 26, 2026
419cef9
fix(mac_brew_pkg): exclude packages without full_token
cdalvaro Feb 25, 2026
3c18124
fix(mac_brew_pkg): use empty string if no version is reported
cdalvaro Feb 25, 2026
b6c65a6
test(mac_brew_pkg): add tests for unknown versions and full_token
cdalvaro Feb 25, 2026
21e5a8a
Merge remote-tracking branch 'saltstack/3006.x' into merge/3006.x/300…
dwoz Mar 4, 2026
c86c19d
Stabalize performance test
dwoz Mar 4, 2026
8d63118
Fix CI failure discovery tools and performance test robustness
dwoz Mar 12, 2026
ff60cdf
Fix PhotonOS password expiration in CI workflows
dwoz Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,7 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -479,7 +479,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
source: "onedir"
Expand All @@ -496,7 +496,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
source: "src"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/nightly.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -515,7 +515,7 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -532,7 +532,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
source: "onedir"
Expand All @@ -553,7 +553,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
source: "src"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/scheduled.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -505,7 +505,7 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -522,7 +522,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
source: "onedir"
Expand All @@ -539,7 +539,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
source: "src"
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/staging.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@ jobs:
with:
cache-seed: ${{ needs.prepare-workflow.outputs.cache-seed }}
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
matrix: ${{ toJSON(fromJSON(needs.prepare-workflow.outputs.config)['build-matrix']) }}
Expand All @@ -507,7 +507,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
source: "onedir"
Expand All @@ -529,7 +529,7 @@ jobs:
with:
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
relenv-version: "0.22.3"
relenv-version: "0.22.4"
python-version: "3.10.19"
ci-python-version: "3.11"
source: "src"
Expand Down
12 changes: 11 additions & 1 deletion .github/workflows/test-action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,11 @@ jobs:
run: |
/usr/bin/docker start ${{ github.run_id }}_salt-test

- name: Fix PhotonOS password expiration
if: startsWith(matrix.slug, 'photonos-')
run: |
docker exec ${{ github.run_id }}_salt-test chage -I -1 -m 0 -M 99999 -E -1 root

- name: "Show container inspect ${{ matrix.container }}"
run: |
/usr/bin/docker inspect ${{ github.run_id }}_salt-test
Expand Down Expand Up @@ -505,6 +510,11 @@ jobs:
run: |
/usr/bin/docker start ${{ github.run_id }}_salt-test

- name: Fix PhotonOS password expiration
if: startsWith(matrix.slug, 'photonos-')
run: |
docker exec ${{ github.run_id }}_salt-test chage -I -1 -m 0 -M 99999 -E -1 root

- name: "Show container inspect ${{ matrix.container }}"
run: |
/usr/bin/docker inspect ${{ github.run_id }}_salt-test
Expand Down Expand Up @@ -985,7 +995,7 @@ jobs:
name: ${{ matrix.display_name }} ${{ matrix.tests-chunk }} ${{ matrix.transport }}${{ matrix.test-group && ' ' || '' }}${{ matrix.test-group && matrix.test-group || '' }}

if: ${{ !cancelled() && toJSON(fromJSON(inputs.matrix)['windows']) != '[]' }}
runs-on: ${{ matrix.slug }}
runs-on: ${{ matrix.runner }}
# Full test runs. Each chunk should never take more than 2 hours.
# Partial test runs(no chunk parallelization), 6 Hours
timeout-minutes: ${{ fromJSON(inputs.testrun)['type'] == 'full' && inputs.default-timeout || 360 }}
Expand Down
7 changes: 6 additions & 1 deletion .github/workflows/test-packages-action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,11 @@ jobs:
run: |
/usr/bin/docker start ${{ github.run_id }}_salt-test-pkg

- name: Fix PhotonOS password expiration
if: startsWith(matrix.slug, 'photonos-')
run: |
docker exec ${{ github.run_id }}_salt-test-pkg chage -I -1 -m 0 -M 99999 -E -1 root

- name: Decompress .nox Directory
run: |
docker exec ${{ github.run_id}}_salt-test-pkg python3 -m nox --force-color -e decompress-dependencies -- linux ${{ matrix.arch }}
Expand Down Expand Up @@ -319,7 +324,7 @@ jobs:

test-windows:
name: ${{ matrix.display_name }} ${{ matrix.pkg_type }} ${{ matrix.tests-chunk }} ${{ matrix.version }}
runs-on: ${{ matrix.slug }}
runs-on: ${{ matrix.runner }}
timeout-minutes: 120 # 2 Hours - More than this and something is wrong
if: ${{ !cancelled() && toJSON(fromJSON(inputs.matrix)['windows']) != '[]' }}
strategy:
Expand Down
10 changes: 10 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,3 +145,13 @@ nox.*.tar.xz
/pkg/debian/debhelper-build-stamp

.tools-venvs

# AI Agent instruction files (templates are in agents/)
/CLAUDE.md
/GEMINI.md
/CURSOR.md
/COPILOT.md
/.cursorrules
/.aiderignore
/aider.conf.yml
/.gemini
Loading
Loading