Skip to content

Commit 246d066

Browse files
dwozdwoz
authored
Merge pull request #66691 from dwoz/merge/master/3007.x
[master] Merge forward 3007.x into master
2 parents 18ca4fd + 17c58d6 commit 246d066

File tree

213 files changed

+4659
-1767
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

213 files changed

+4659
-1767
lines changed

‎.github/CODEOWNERS‎

Lines changed: 1 addition & 52 deletions
Original file line numberDiff line numberDiff line change
@@ -9,55 +9,4 @@
99
# This file uses an fnmatch-style matching pattern.
1010

1111
# Team Core
12-
* @saltstack/team-core
13-
14-
# Team Boto
15-
salt/*/*boto* @saltstack/team-core
16-
17-
# Team Cloud
18-
salt/cloud/* @saltstack/team-core
19-
salt/utils/openstack/* @saltstack/team-core
20-
salt/utils/aws.py @saltstack/team-core
21-
salt/*/*cloud* @saltstack/team-core
22-
23-
# Team NetAPI
24-
salt/cli/api.py @saltstack/team-core
25-
salt/client/netapi.py @saltstack/team-core
26-
salt/netapi/* @saltstack/team-core
27-
28-
# Team Network
29-
salt/proxy/* @saltstack/team-core
30-
31-
# Team SPM
32-
salt/cli/spm.py @saltstack/team-core
33-
salt/spm/* @saltstack/team-core
34-
35-
# Team SSH
36-
salt/cli/ssh.py @saltstack/team-core
37-
salt/client/ssh/* @saltstack/team-core
38-
salt/roster/* @saltstack/team-core
39-
salt/runners/ssh.py @saltstack/team-core
40-
salt/*/thin.py @saltstack/team-core
41-
42-
# Team State
43-
salt/state.py @saltstack/team-core
44-
45-
# Team SUSE
46-
salt/*/*btrfs* @saltstack/team-core
47-
salt/*/*kubernetes* @saltstack/team-core
48-
salt/*/*pkg* @saltstack/team-core
49-
salt/*/*snapper* @saltstack/team-core
50-
salt/*/*xfs* @saltstack/team-core
51-
salt/*/*zypper* @saltstack/team-core
52-
53-
# Team Transport
54-
salt/transport/* @saltstack/team-core
55-
salt/utils/zeromq.py @saltstack/team-core
56-
57-
# Team Windows
58-
salt/*/*win* @saltstack/team-core
59-
salt/modules/reg.py @saltstack/team-core
60-
salt/states/reg.py @saltstack/team-core
61-
tests/*/*win* @saltstack/team-core
62-
tests/*/test_reg.py @saltstack/team-core
63-
tests/pytests/* @saltstack/team-core @s0undt3ch
12+
* @saltstack/salt-core-maintainers

‎.github/workflows/build-deps-ci-action.yml‎

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,9 @@ env:
4040
COLUMNS: 190
4141
AWS_MAX_ATTEMPTS: "10"
4242
AWS_RETRY_MODE: "adaptive"
43-
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
44-
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
43+
PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
44+
PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
45+
PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
4546
PIP_DISABLE_PIP_VERSION_CHECK: "1"
4647
RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
4748

@@ -52,6 +53,8 @@ jobs:
5253
runs-on: ubuntu-latest
5354
outputs:
5455
matrix-include: ${{ steps.generate-matrix.outputs.matrix }}
56+
env:
57+
PIP_INDEX_URL: https://pypi.org/simple
5558
steps:
5659

5760
- name: "Throttle Builds"
@@ -66,6 +69,8 @@ jobs:
6669
uses: ./.github/actions/setup-python-tools-scripts
6770
with:
6871
cache-prefix: ${{ inputs.cache-prefix }}
72+
env:
73+
PIP_INDEX_URL: https://pypi.org/simple
6974

7075
- name: Generate Test Matrix
7176
id: generate-matrix
@@ -123,7 +128,7 @@ jobs:
123128
- name: PyPi Proxy
124129
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
125130
run: |
126-
sed -i '7s;^;--index-url=https://pypi-proxy.saltstack.net/root/local/+simple/ --extra-index-url=https://pypi.org/simple\n;' requirements/static/ci/*/*.txt
131+
sed -i '7s;^;--index-url=${{ vars.PIP_INDEX_URL }} --trusted-host ${{ vars.PIP_TRUSTED_HOST }} --extra-index-url=${{ vars.PIP_EXTRA_INDEX_URL }}\n;' requirements/static/ci/*/*.txt
127132
128133
- name: Setup Python Tools Scripts
129134
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
@@ -195,6 +200,8 @@ jobs:
195200
fail-fast: false
196201
matrix:
197202
include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['macos'] }}
203+
env:
204+
PIP_INDEX_URL: https://pypi.org/simple
198205
steps:
199206

200207
- name: "Throttle Builds"
@@ -321,7 +328,7 @@ jobs:
321328
- name: PyPi Proxy
322329
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
323330
run: |
324-
sed -i '7s;^;--index-url=https://pypi-proxy.saltstack.net/root/local/+simple/ --extra-index-url=https://pypi.org/simple\n;' requirements/static/ci/*/*.txt
331+
sed -i '7s;^;--index-url=${{ vars.PIP_INDEX_URL }} --trusted-host ${{ vars.PIP_TRUSTED_HOST }} --extra-index-url=${{ vars.PIP_EXTRA_INDEX_URL }}\n;' requirements/static/ci/*/*.txt
325332
326333
- name: Setup Python Tools Scripts
327334
if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'

‎.github/workflows/build-deps-onedir.yml‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ env:
3232
COLUMNS: 190
3333
AWS_MAX_ATTEMPTS: "10"
3434
AWS_RETRY_MODE: "adaptive"
35-
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
36-
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
35+
PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
36+
PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
37+
PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
3738
PIP_DISABLE_PIP_VERSION_CHECK: "1"
3839

3940
jobs:
@@ -98,6 +99,7 @@ jobs:
9899
- ${{ matrix.arch == 'arm64' && 'macos-13-xlarge' || 'macos-12' }}
99100
env:
100101
USE_S3_CACHE: 'false'
102+
PIP_INDEX_URL: https://pypi.org/simple
101103
steps:
102104

103105
- name: "Throttle Builds"
@@ -148,6 +150,7 @@ jobs:
148150
runs-on: windows-latest
149151
env:
150152
USE_S3_CACHE: 'false'
153+
PIP_INDEX_URL: https://pypi.org/simple
151154
steps:
152155

153156
- name: "Throttle Builds"

‎.github/workflows/build-docs.yml‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,7 @@ env:
1717
COLUMNS: 190
1818
AWS_MAX_ATTEMPTS: "10"
1919
AWS_RETRY_MODE: "adaptive"
20-
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
21-
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
20+
PIP_INDEX_URL: https://pypi.org/simple
2221
PIP_DISABLE_PIP_VERSION_CHECK: "1"
2322

2423
jobs:

‎.github/workflows/build-packages.yml‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,9 @@ on:
3939

4040
env:
4141
COLUMNS: 190
42-
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
43-
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
42+
PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
43+
PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
44+
PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
4445
PIP_DISABLE_PIP_VERSION_CHECK: "1"
4546

4647
jobs:
@@ -54,7 +55,8 @@ jobs:
5455
arch: ${{ github.event.repository.fork && fromJSON('["x86_64"]') || fromJSON('["x86_64", "arm64"]') }}
5556
source:
5657
- ${{ inputs.source }}
57-
58+
env:
59+
PIP_INDEX_URL: https://pypi.org/simple
5860
runs-on:
5961
- ${{ matrix.arch == 'arm64' && 'macos-13-xlarge' || 'macos-12' }}
6062

@@ -289,7 +291,7 @@ jobs:
289291
- ${{ inputs.source }}
290292

291293
container:
292-
image: ghcr.io/saltstack/salt-ci-containers/packaging:centosstream-9
294+
image: ghcr.io/saltstack/salt-ci-containers/packaging:rockylinux-9
293295

294296
steps:
295297
- uses: actions/checkout@v4
@@ -375,6 +377,7 @@ jobs:
375377
SM_CLIENT_CERT_PASSWORD: "${{ secrets.WIN_SIGN_CERT_PASSWORD }}"
376378
SM_CLIENT_CERT_FILE_B64: "${{ secrets.WIN_SIGN_CERT_FILE_B64 }}"
377379
WIN_SIGN_CERT_SHA1_HASH: "${{ secrets.WIN_SIGN_CERT_SHA1_HASH }}"
380+
PIP_INDEX_URL: https://pypi.org/simple
378381

379382
steps:
380383
- name: Check Package Signing Enabled

‎.github/workflows/build-salt-onedir.yml‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,9 @@ env:
3232
COLUMNS: 190
3333
AWS_MAX_ATTEMPTS: "10"
3434
AWS_RETRY_MODE: "adaptive"
35-
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
36-
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
35+
PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
36+
PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
37+
PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
3738
PIP_DISABLE_PIP_VERSION_CHECK: "1"
3839

3940
jobs:
@@ -102,6 +103,8 @@ jobs:
102103
arch: ${{ github.event.repository.fork && fromJSON('["x86_64"]') || fromJSON('["x86_64", "arm64"]') }}
103104
runs-on:
104105
- ${{ matrix.arch == 'arm64' && 'macos-13-xlarge' || 'macos-12' }}
106+
env:
107+
PIP_INDEX_URL: https://pypi.org/simple
105108

106109
steps:
107110
- name: "Throttle Builds"
@@ -156,6 +159,9 @@ jobs:
156159
- x86
157160
- amd64
158161
runs-on: windows-latest
162+
env:
163+
PIP_INDEX_URL: https://pypi.org/simple
164+
159165
steps:
160166

161167
- name: "Throttle Builds"

‎.github/workflows/ci.yml‎

Lines changed: 6 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ jobs:
437437
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
438438
self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
439439
github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
440-
relenv-version: "0.16.0"
440+
relenv-version: "0.17.0"
441441
python-version: "3.10.14"
442442

443443
build-salt-onedir:
@@ -453,7 +453,7 @@ jobs:
453453
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
454454
self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
455455
github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
456-
relenv-version: "0.16.0"
456+
relenv-version: "0.17.0"
457457
python-version: "3.10.14"
458458

459459
build-pkgs-onedir:
@@ -466,7 +466,7 @@ jobs:
466466
with:
467467
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
468468
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
469-
relenv-version: "0.16.0"
469+
relenv-version: "0.17.0"
470470
python-version: "3.10.14"
471471
source: "onedir"
472472

@@ -480,7 +480,7 @@ jobs:
480480
with:
481481
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
482482
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
483-
relenv-version: "0.16.0"
483+
relenv-version: "0.17.0"
484484
python-version: "3.10.14"
485485
source: "src"
486486
build-ci-deps:
@@ -666,27 +666,6 @@ jobs:
666666
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
667667
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
668668

669-
centos-7-pkg-tests:
670-
name: CentOS 7 Package Test
671-
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'centos-7') }}
672-
needs:
673-
- prepare-workflow
674-
- build-pkgs-onedir
675-
- build-ci-deps
676-
uses: ./.github/workflows/test-packages-action-linux.yml
677-
with:
678-
distro-slug: centos-7
679-
nox-session: ci-test-onedir
680-
platform: linux
681-
arch: x86_64
682-
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
683-
pkg-type: rpm
684-
nox-version: 2022.8.7
685-
python-version: "3.10"
686-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
687-
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
688-
testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
689-
690669
debian-11-pkg-tests:
691670
name: Debian 11 Package Test
692671
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'debian-11') }}
@@ -1579,27 +1558,6 @@ jobs:
15791558
workflow-slug: ci
15801559
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
15811560

1582-
centos-7:
1583-
name: CentOS 7 Test
1584-
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'centos-7') }}
1585-
needs:
1586-
- prepare-workflow
1587-
- build-ci-deps
1588-
uses: ./.github/workflows/test-action-linux.yml
1589-
with:
1590-
distro-slug: centos-7
1591-
nox-session: ci-test-onedir
1592-
platform: linux
1593-
arch: x86_64
1594-
nox-version: 2022.8.7
1595-
gh-actions-python-version: "3.10"
1596-
testrun: ${{ needs.prepare-workflow.outputs.testrun }}
1597-
salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
1598-
cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
1599-
skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
1600-
workflow-slug: ci
1601-
timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
1602-
16031561
debian-11:
16041562
name: Debian 11 Test
16051563
if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'debian-11') }}
@@ -2028,6 +1986,8 @@ jobs:
20281986
name: Combine Code Coverage
20291987
if: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] == false }}
20301988
runs-on: ubuntu-latest
1989+
env:
1990+
PIP_INDEX_URL: https://pypi.org/simple
20311991
needs:
20321992
- prepare-workflow
20331993
- build-ci-deps
@@ -2046,7 +2006,6 @@ jobs:
20462006
- amazonlinux-2023
20472007
- amazonlinux-2023-arm64
20482008
- archlinux-lts
2049-
- centos-7
20502009
- debian-11
20512010
- debian-11-arm64
20522011
- debian-12
@@ -2214,7 +2173,6 @@ jobs:
22142173
- amazonlinux-2023
22152174
- amazonlinux-2023-arm64
22162175
- archlinux-lts
2217-
- centos-7
22182176
- debian-11
22192177
- debian-11-arm64
22202178
- debian-12
@@ -2243,7 +2201,6 @@ jobs:
22432201
- amazonlinux-2-arm64-pkg-tests
22442202
- amazonlinux-2023-pkg-tests
22452203
- amazonlinux-2023-arm64-pkg-tests
2246-
- centos-7-pkg-tests
22472204
- debian-11-pkg-tests
22482205
- debian-11-arm64-pkg-tests
22492206
- debian-12-pkg-tests

‎.github/workflows/lint-action.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ on:
1111

1212

1313
env:
14-
PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
15-
PIP_EXTRA_INDEX_URL: https://pypi.org/simple
14+
PIP_INDEX_URL: https://pypi.org/simple
1615
PIP_DISABLE_PIP_VERSION_CHECK: "1"
1716

1817

@@ -23,7 +22,7 @@ jobs:
2322
if: ${{ contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['salt'] || fromJSON(inputs.changed-files)['lint'] }}
2423

2524
container:
26-
image: ghcr.io/saltstack/salt-ci-containers/python:3.9
25+
image: ghcr.io/saltstack/salt-ci-containers/python:3.10
2726

2827
steps:
2928
- name: Install System Deps
@@ -67,7 +66,7 @@ jobs:
6766
if: ${{ contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['tests'] || fromJSON(inputs.changed-files)['lint'] }}
6867

6968
container:
70-
image: ghcr.io/saltstack/salt-ci-containers/python:3.8
69+
image: ghcr.io/saltstack/salt-ci-containers/python:3.10
7170

7271
steps:
7372
- name: Install System Deps

0 commit comments

Comments
 (0)