Merge pull request #66691 from dwoz/merge/master/3007.x

[master] Merge forward 3007.x into master
saltstack · Aug 19, 2024 · 246d066 · 246d066
2 parents 18ca4fd + 17c58d6
commit 246d066
Show file tree

Hide file tree

Showing 213 changed files with 4,659 additions and 1,767 deletions.
diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
@@ -9,55 +9,4 @@
 # This file uses an fnmatch-style matching pattern.
 
 # Team Core
-*                                   @saltstack/team-core
-
-# Team Boto
-salt/*/*boto*                       @saltstack/team-core
-
-# Team Cloud
-salt/cloud/*                        @saltstack/team-core
-salt/utils/openstack/*              @saltstack/team-core
-salt/utils/aws.py                   @saltstack/team-core
-salt/*/*cloud*                      @saltstack/team-core
-
-# Team NetAPI
-salt/cli/api.py                     @saltstack/team-core
-salt/client/netapi.py               @saltstack/team-core
-salt/netapi/*                       @saltstack/team-core
-
-# Team Network
-salt/proxy/*                        @saltstack/team-core
-
-# Team SPM
-salt/cli/spm.py                     @saltstack/team-core
-salt/spm/*                          @saltstack/team-core
-
-# Team SSH
-salt/cli/ssh.py                     @saltstack/team-core
-salt/client/ssh/*                   @saltstack/team-core
-salt/roster/*                       @saltstack/team-core
-salt/runners/ssh.py                 @saltstack/team-core
-salt/*/thin.py                      @saltstack/team-core
-
-# Team State
-salt/state.py                       @saltstack/team-core
-
-# Team SUSE
-salt/*/*btrfs*                      @saltstack/team-core
-salt/*/*kubernetes*                 @saltstack/team-core
-salt/*/*pkg*                        @saltstack/team-core
-salt/*/*snapper*                    @saltstack/team-core
-salt/*/*xfs*                        @saltstack/team-core
-salt/*/*zypper*                     @saltstack/team-core
-
-# Team Transport
-salt/transport/*                    @saltstack/team-core
-salt/utils/zeromq.py                @saltstack/team-core
-
-# Team Windows
-salt/*/*win*                        @saltstack/team-core
-salt/modules/reg.py                 @saltstack/team-core
-salt/states/reg.py                  @saltstack/team-core
-tests/*/*win*                       @saltstack/team-core
-tests/*/test_reg.py                 @saltstack/team-core
-tests/pytests/*                     @saltstack/team-core @s0undt3ch
+*                                   @saltstack/salt-core-maintainers
diff --git a/.github/workflows/build-deps-ci-action.yml b/.github/workflows/build-deps-ci-action.yml
@@ -40,8 +40,9 @@ env:
   COLUMNS: 190
   AWS_MAX_ATTEMPTS: "10"
   AWS_RETRY_MODE: "adaptive"
-  PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
-  PIP_EXTRA_INDEX_URL: https://pypi.org/simple
+  PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
+  PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
+  PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
   PIP_DISABLE_PIP_VERSION_CHECK: "1"
   RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
 
@@ -52,6 +53,8 @@ jobs:
     runs-on: ubuntu-latest
     outputs:
       matrix-include: ${{ steps.generate-matrix.outputs.matrix }}
+    env:
+      PIP_INDEX_URL: https://pypi.org/simple
     steps:
 
       - name: "Throttle Builds"
@@ -66,6 +69,8 @@ jobs:
         uses: ./.github/actions/setup-python-tools-scripts
         with:
           cache-prefix: ${{ inputs.cache-prefix }}
+        env:
+          PIP_INDEX_URL: https://pypi.org/simple
 
       - name: Generate Test Matrix
         id: generate-matrix
@@ -123,7 +128,7 @@ jobs:
       - name: PyPi Proxy
         if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
         run: |
-          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
+          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
 
       - name: Setup Python Tools Scripts
         if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
@@ -195,6 +200,8 @@ jobs:
       fail-fast: false
       matrix:
         include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include)['macos'] }}
+    env:
+      PIP_INDEX_URL: https://pypi.org/simple
     steps:
 
       - name: "Throttle Builds"
@@ -321,7 +328,7 @@ jobs:
       - name: PyPi Proxy
         if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
         run: |
-          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
+          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
 
       - name: Setup Python Tools Scripts
         if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'

diff --git a/.github/workflows/build-deps-onedir.yml b/.github/workflows/build-deps-onedir.yml
@@ -32,8 +32,9 @@ env:
   COLUMNS: 190
   AWS_MAX_ATTEMPTS: "10"
   AWS_RETRY_MODE: "adaptive"
-  PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
-  PIP_EXTRA_INDEX_URL: https://pypi.org/simple
+  PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
+  PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
+  PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
   PIP_DISABLE_PIP_VERSION_CHECK: "1"
 
 jobs:
@@ -98,6 +99,7 @@ jobs:
       - ${{ matrix.arch == 'arm64' && 'macos-13-xlarge' || 'macos-12' }}
     env:
       USE_S3_CACHE: 'false'
+      PIP_INDEX_URL: https://pypi.org/simple
     steps:
 
       - name: "Throttle Builds"
@@ -148,6 +150,7 @@ jobs:
     runs-on: windows-latest
     env:
       USE_S3_CACHE: 'false'
+      PIP_INDEX_URL: https://pypi.org/simple
     steps:
 
       - name: "Throttle Builds"

diff --git a/.github/workflows/build-docs.yml b/.github/workflows/build-docs.yml
@@ -17,8 +17,7 @@ env:
   COLUMNS: 190
   AWS_MAX_ATTEMPTS: "10"
   AWS_RETRY_MODE: "adaptive"
-  PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
-  PIP_EXTRA_INDEX_URL: https://pypi.org/simple
+  PIP_INDEX_URL: https://pypi.org/simple
   PIP_DISABLE_PIP_VERSION_CHECK: "1"
 
 jobs:

diff --git a/.github/workflows/build-packages.yml b/.github/workflows/build-packages.yml
@@ -39,8 +39,9 @@ on:
 
 env:
   COLUMNS: 190
-  PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
-  PIP_EXTRA_INDEX_URL: https://pypi.org/simple
+  PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
+  PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
+  PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
   PIP_DISABLE_PIP_VERSION_CHECK: "1"
 
 jobs:
@@ -54,7 +55,8 @@ jobs:
         arch: ${{ github.event.repository.fork && fromJSON('["x86_64"]') || fromJSON('["x86_64", "arm64"]') }}
         source:
           - ${{ inputs.source }}
-
+    env:
+      PIP_INDEX_URL: https://pypi.org/simple
     runs-on:
       - ${{ matrix.arch == 'arm64' && 'macos-13-xlarge' || 'macos-12' }}
 
@@ -289,7 +291,7 @@ jobs:
           - ${{ inputs.source }}
 
     container:
-      image: ghcr.io/saltstack/salt-ci-containers/packaging:centosstream-9
+      image: ghcr.io/saltstack/salt-ci-containers/packaging:rockylinux-9
 
     steps:
       - uses: actions/checkout@v4
@@ -375,6 +377,7 @@ jobs:
       SM_CLIENT_CERT_PASSWORD: "${{ secrets.WIN_SIGN_CERT_PASSWORD }}"
       SM_CLIENT_CERT_FILE_B64: "${{ secrets.WIN_SIGN_CERT_FILE_B64 }}"
       WIN_SIGN_CERT_SHA1_HASH: "${{ secrets.WIN_SIGN_CERT_SHA1_HASH }}"
+      PIP_INDEX_URL: https://pypi.org/simple
 
     steps:
       - name: Check Package Signing Enabled

diff --git a/.github/workflows/build-salt-onedir.yml b/.github/workflows/build-salt-onedir.yml
@@ -32,8 +32,9 @@ env:
   COLUMNS: 190
   AWS_MAX_ATTEMPTS: "10"
   AWS_RETRY_MODE: "adaptive"
-  PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
-  PIP_EXTRA_INDEX_URL: https://pypi.org/simple
+  PIP_INDEX_URL: ${{ vars.PIP_INDEX_URL }}
+  PIP_TRUSTED_HOST: ${{ vars.PIP_TRUSTED_HOST }}
+  PIP_EXTRA_INDEX_URL: ${{ vars.PIP_EXTRA_INDEX_URL }}
   PIP_DISABLE_PIP_VERSION_CHECK: "1"
 
 jobs:
@@ -102,6 +103,8 @@ jobs:
         arch: ${{ github.event.repository.fork && fromJSON('["x86_64"]') || fromJSON('["x86_64", "arm64"]') }}
     runs-on:
       - ${{ matrix.arch == 'arm64' && 'macos-13-xlarge' || 'macos-12' }}
+    env:
+      PIP_INDEX_URL: https://pypi.org/simple
 
     steps:
       - name: "Throttle Builds"
@@ -156,6 +159,9 @@ jobs:
           - x86
           - amd64
     runs-on: windows-latest
+    env:
+      PIP_INDEX_URL: https://pypi.org/simple
+
     steps:
 
       - name: "Throttle Builds"

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -437,7 +437,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
       github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
-      relenv-version: "0.16.0"
+      relenv-version: "0.17.0"
       python-version: "3.10.14"
 
   build-salt-onedir:
@@ -453,7 +453,7 @@ jobs:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       self-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
       github-hosted-runners: ${{ fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
-      relenv-version: "0.16.0"
+      relenv-version: "0.17.0"
       python-version: "3.10.14"
 
   build-pkgs-onedir:
@@ -466,7 +466,7 @@ jobs:
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.16.0"
+      relenv-version: "0.17.0"
       python-version: "3.10.14"
       source: "onedir"
 
@@ -480,7 +480,7 @@ jobs:
     with:
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}
-      relenv-version: "0.16.0"
+      relenv-version: "0.17.0"
       python-version: "3.10.14"
       source: "src"
   build-ci-deps:
@@ -666,27 +666,6 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
-  centos-7-pkg-tests:
-    name: CentOS 7 Package Test
-    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') }}
-    needs:
-      - prepare-workflow
-      - build-pkgs-onedir
-      - build-ci-deps
-    uses: ./.github/workflows/test-packages-action-linux.yml
-    with:
-      distro-slug: centos-7
-      nox-session: ci-test-onedir
-      platform: linux
-      arch: x86_64
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      pkg-type: rpm
-      nox-version: 2022.8.7
-      python-version: "3.10"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
-      skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
-      testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
-
   debian-11-pkg-tests:
     name: Debian 11 Package Test
     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:
       workflow-slug: ci
       timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
 
-  centos-7:
-    name: CentOS 7 Test
-    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') }}
-    needs:
-      - prepare-workflow
-      - build-ci-deps
-    uses: ./.github/workflows/test-action-linux.yml
-    with:
-      distro-slug: centos-7
-      nox-session: ci-test-onedir
-      platform: linux
-      arch: x86_64
-      nox-version: 2022.8.7
-      gh-actions-python-version: "3.10"
-      testrun: ${{ needs.prepare-workflow.outputs.testrun }}
-      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
-      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
-      skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
-      workflow-slug: ci
-      timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
-
   debian-11:
     name: Debian 11 Test
     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:
     name: Combine Code Coverage
     if: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] == false }}
     runs-on: ubuntu-latest
+    env:
+      PIP_INDEX_URL: https://pypi.org/simple
     needs:
       - prepare-workflow
       - build-ci-deps
@@ -2046,7 +2006,6 @@ jobs:
       - amazonlinux-2023
       - amazonlinux-2023-arm64
       - archlinux-lts
-      - centos-7
       - debian-11
       - debian-11-arm64
       - debian-12
@@ -2214,7 +2173,6 @@ jobs:
       - amazonlinux-2023
       - amazonlinux-2023-arm64
       - archlinux-lts
-      - centos-7
       - debian-11
       - debian-11-arm64
       - debian-12
@@ -2243,7 +2201,6 @@ jobs:
       - amazonlinux-2-arm64-pkg-tests
       - amazonlinux-2023-pkg-tests
       - amazonlinux-2023-arm64-pkg-tests
-      - centos-7-pkg-tests
       - debian-11-pkg-tests
       - debian-11-arm64-pkg-tests
       - debian-12-pkg-tests

diff --git a/.github/workflows/lint-action.yml b/.github/workflows/lint-action.yml
@@ -11,8 +11,7 @@ on:
 
 
 env:
-  PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
-  PIP_EXTRA_INDEX_URL: https://pypi.org/simple
+  PIP_INDEX_URL: https://pypi.org/simple
   PIP_DISABLE_PIP_VERSION_CHECK: "1"
 
 
@@ -23,7 +22,7 @@ jobs:
     if: ${{ contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['salt'] || fromJSON(inputs.changed-files)['lint'] }}
 
     container:
-      image: ghcr.io/saltstack/salt-ci-containers/python:3.9
+      image: ghcr.io/saltstack/salt-ci-containers/python:3.10
 
     steps:
       - name: Install System Deps
@@ -67,7 +66,7 @@ jobs:
     if: ${{ contains(fromJSON('["push", "schedule", "workflow_dispatch"]'), github.event_name) || fromJSON(inputs.changed-files)['tests'] || fromJSON(inputs.changed-files)['lint'] }}
 
     container:
-      image: ghcr.io/saltstack/salt-ci-containers/python:3.8
+      image: ghcr.io/saltstack/salt-ci-containers/python:3.10
 
     steps:
       - name: Install System Deps