Merge 3006.x into master

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

@@ -1,5 +1,5 @@
 ---
-name: Build Debian Packages
+name: Build DEB Packages
 
 on:
   workflow_call:
@@ -16,6 +16,17 @@ on:
         required: true
         type: string
         description: The version of python to use with relenv
+      source:
+        required: true
+        type: string
+        description: The backend to build the packages with
+
+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
 
 jobs:
   build:
@@ -31,19 +42,18 @@ jobs:
           - x86_64
           - aarch64
         source:
-          - onedir
-          - src
+          - ${{ inputs.source }}
 
     container:
       image: ghcr.io/saltstack/salt-ci-containers/packaging:debian-12
 
     steps:
       # Checkout here so we can easily use custom actions
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       # Checkout here for the build process
       - name: Checkout in build directory
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           path:
             pkgs/checkout/
@@ -89,7 +99,7 @@ jobs:
         working-directory: pkgs/checkout/
         run: |
           tools pkg build deb --relenv-version=${{ inputs.relenv-version }} --python-version=${{ inputs.python-version }} ${{
-              matrix.source == 'onedir' &&
+              inputs.source == 'onedir' &&
               format('--onedir=salt-{0}-onedir-linux-{1}.tar.xz', inputs.salt-version, matrix.arch)
               ||
               format('--arch={0}', matrix.arch)
@@ -102,7 +112,7 @@ jobs:
       - name: Set Artifact Name
         id: set-artifact-name
         run: |
-          if [ "${{ matrix.source }}" != "src" ]; then
+          if [ "${{ inputs.source }}" != "src" ]; then
             echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-deb" >> "$GITHUB_OUTPUT"
           else
             echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-deb-from-src" >> "$GITHUB_OUTPUT"

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

@@ -0,0 +1,134 @@
+---
+name: Test Dependencies
+
+on:
+  workflow_call:
+    inputs:
+      distro-slug:
+        required: true
+        type: string
+        description: The OS slug to run tests against
+      nox-session:
+        required: true
+        type: string
+        description: The nox session to run
+      salt-version:
+        type: string
+        required: true
+        description: The Salt version to set prior to running tests.
+      cache-prefix:
+        required: true
+        type: string
+        description: Seed used to invalidate caches
+      platform:
+        required: true
+        type: string
+        description: The platform being tested
+      arch:
+        required: true
+        type: string
+        description: The platform arch being tested
+      nox-version:
+        required: true
+        type: string
+        description: The nox version to install
+      python-version:
+        required: false
+        type: string
+        description: The python version to run tests with
+        default: "3.10"
+      package-name:
+        required: false
+        type: string
+        description: The onedir package name to use
+        default: salt
+
+
+env:
+  COLUMNS: 190
+  PIP_INDEX_URL: "https://pypi-proxy.saltstack.net/root/local/+simple/"
+  PIP_EXTRA_INDEX_URL: "https://pypi.org/simple"
+
+jobs:
+
+  dependencies:
+    name: Test Dependencies
+    runs-on: ${{ inputs.distro-slug }}
+    timeout-minutes: 90
+    steps:
+
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t"
+
+      - name: Checkout Source Code
+        uses: actions/checkout@v4
+
+      - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
+        id: nox-dependencies-cache
+        uses: actions/cache@v3
+        with:
+          path: nox.${{ inputs.distro-slug }}.tar.*
+          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
+              hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py')
+            }}
+
+      - name: Download Onedir Tarball as an Artifact
+        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        uses: actions/download-artifact@v3
+        with:
+          name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
+          path: artifacts/
+
+      - name: Decompress Onedir Tarball
+        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        shell: bash
+        run: |
+          python3 -c "import os; os.makedirs('artifacts', exist_ok=True)"
+          cd artifacts
+          tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
+
+      - name: Set up Python ${{ inputs.python-version }}
+        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        uses: actions/setup-python@v4
+        with:
+          python-version: "${{ inputs.python-version }}"
+
+      - name: Install System Dependencies
+        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        run: |
+          brew install openssl@3
+
+      - name: Install Nox
+        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        run: |
+          python3 -m pip install 'nox==${{ inputs.nox-version }}'
+
+      - name: Install Dependencies
+        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        env:
+          PRINT_TEST_SELECTION: "0"
+          PRINT_SYSTEM_INFO: "0"
+        run: |
+          export PYCURL_SSL_LIBRARY=openssl
+          export LDFLAGS="-L/usr/local/opt/openssl@3/lib"
+          export CPPFLAGS="-I/usr/local/opt/openssl@3/include"
+          export PKG_CONFIG_PATH="/usr/local/opt/openssl@3/lib/pkgconfig"
+          nox --install-only -e ${{ inputs.nox-session }}
+
+      - name: Cleanup .nox Directory
+        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        run: |
+          nox -e "pre-archive-cleanup(pkg=False)"
+
+      - name: Compress .nox Directory
+        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        run: |
+          nox -e compress-dependencies -- ${{ inputs.distro-slug }}
+
+      - name: Upload Nox Requirements Tarball
+        uses: actions/upload-artifact@v3
+        with:
+          name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
+          path: nox.${{ inputs.distro-slug }}.tar.*

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

@@ -0,0 +1,158 @@
+---
+name: Test Dependencies
+
+on:
+  workflow_call:
+    inputs:
+      distro-slug:
+        required: true
+        type: string
+        description: The OS slug to run tests against
+      nox-session:
+        required: true
+        type: string
+        description: The nox session to run
+      salt-version:
+        type: string
+        required: true
+        description: The Salt version to set prior to running tests.
+      cache-prefix:
+        required: true
+        type: string
+        description: Seed used to invalidate caches
+      platform:
+        required: true
+        type: string
+        description: The platform being tested
+      arch:
+        required: true
+        type: string
+        description: The platform arch being tested
+      nox-version:
+        required: true
+        type: string
+        description: The nox version to install
+      python-version:
+        required: false
+        type: string
+        description: The python version to run tests with
+        default: "3.10"
+      package-name:
+        required: false
+        type: string
+        description: The onedir package name to use
+        default: salt
+
+
+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
+
+jobs:
+
+  dependencies:
+    name: Test Dependencies
+    runs-on:
+      - self-hosted
+      - linux
+      - bastion
+    timeout-minutes: 90
+    steps:
+
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
+
+      - name: Checkout Source Code
+        uses: actions/checkout@v4
+
+      - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
+        id: nox-dependencies-cache
+        uses: actions/cache@v3
+        with:
+          path: nox.${{ inputs.distro-slug }}.tar.*
+          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
+              hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py')
+            }}
+
+      - name: Download Onedir Tarball as an Artifact
+        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        uses: actions/download-artifact@v3
+        with:
+          name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
+          path: artifacts/
+
+      - name: Decompress Onedir Tarball
+        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        shell: bash
+        run: |
+          python3 -c "import os; os.makedirs('artifacts', exist_ok=True)"
+          cd artifacts
+          tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
+
+      - 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
+
+      - name: Setup Python Tools Scripts
+        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        uses: ./.github/actions/setup-python-tools-scripts
+
+      - name: Get Salt Project GitHub Actions Bot Environment
+        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        run: |
+          TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30")
+          SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment)
+          echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV"
+
+      - name: Start VM
+        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        id: spin-up-vm
+        run: |
+          tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ inputs.distro-slug }}
+
+      - name: List Free Space
+        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        run: |
+          tools --timestamps vm ssh ${{ inputs.distro-slug }} -- df -h || true
+
+      - name: Upload Checkout To VM
+        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        run: |
+          tools --timestamps vm rsync ${{ inputs.distro-slug }}
+
+      - name: Install Dependencies
+        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        run: |
+          tools --timestamps vm install-dependencies --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }}
+
+      - name: Cleanup .nox Directory
+        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        run: |
+          tools --timestamps vm pre-archive-cleanup ${{ inputs.distro-slug }}
+
+      - name: Compress .nox Directory
+        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        run: |
+          tools --timestamps vm compress-dependencies ${{ inputs.distro-slug }}
+
+      - name: Download Compressed .nox Directory
+        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        run: |
+          tools --timestamps vm download-dependencies ${{ inputs.distro-slug }}
+
+      - name: Destroy VM
+        if: always() && steps.nox-dependencies-cache.outputs.cache-hit != 'true'
+        run: |
+          tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }}
+
+      - name: Upload Nox Requirements Tarball
+        uses: actions/upload-artifact@v3
+        with:
+          name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
+          path: nox.${{ inputs.distro-slug }}.tar.*

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

@@ -29,6 +29,11 @@ on:
 
 env:
   RELENV_DATA: "${{ github.workspace }}/.relenv"
+  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
 
 jobs:
 
@@ -46,7 +51,14 @@ jobs:
       - linux
       - ${{ matrix.arch }}
     steps:
-      - uses: actions/checkout@v3
+
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t"
+
+      - uses: actions/checkout@v4
+
       - name: Setup Relenv
         id: setup-relenv
         uses: ./.github/actions/setup-relenv
@@ -81,7 +93,13 @@ jobs:
           - amd64
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t"
+
+      - uses: actions/checkout@v4
 
       - name: Set up Python 3.10
         uses: actions/setup-python@v4
@@ -121,7 +139,13 @@ jobs:
           - x86_64
     runs-on: macos-12
     steps:
-      - uses: actions/checkout@v3
+
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t"
+
+      - uses: actions/checkout@v4
 
       - name: Set up Python 3.10
         uses: actions/setup-python@v4

.github/workflows/build-docs.yml

@@ -13,6 +13,13 @@ on:
         type: string
         description: Seed used to invalidate caches
 
+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
+
 jobs:
   build:
     name: Build
@@ -32,7 +39,7 @@ jobs:
           # - pdf
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Download Release Patch
         if: ${{ startsWith(github.event.ref, 'refs/tags') == false }}

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

@@ -24,6 +24,15 @@ on:
         type: string
         description: The GitHub Environment where this workflow should run
         default: ci
+      source:
+        required: true
+        type: string
+        description: The backend to build the packages with
+
+env:
+  COLUMNS: 190
+  PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
+  PIP_EXTRA_INDEX_URL: https://pypi.org/simple
 
 jobs:
 
@@ -36,8 +45,7 @@ jobs:
         arch:
           - x86_64
         source:
-          - onedir
-          - src
+          - ${{ inputs.source }}
 
     runs-on:
       - macos-12
@@ -66,7 +74,7 @@ jobs:
             echo "sign-pkgs=false" >> "$GITHUB_OUTPUT"
           fi
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: 3.9
@@ -114,7 +122,7 @@ jobs:
           APP_SPEC_PWD: "${{ secrets.MAC_SIGN_APP_SPEC_PWD }}"
         run: |
           tools pkg build macos --relenv-version=${{ inputs.relenv-version }} --python-version=${{ inputs.python-version }} ${{
-              matrix.source == 'onedir' &&
+              inputs.source == 'onedir' &&
               format(
                 '--onedir salt-{0}-onedir-darwin-{1}.tar.xz --salt-version {0} {2}',
                 inputs.salt-version,
@@ -128,7 +136,7 @@ jobs:
       - name: Set Artifact Name
         id: set-artifact-name
         run: |
-          if [ "${{ matrix.source }}" != "src" ]; then
+          if [ "${{ inputs.source }}" != "src" ]; then
             echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-macos" >> "$GITHUB_OUTPUT"
           else
             echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-macos-from-src" >> "$GITHUB_OUTPUT"

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

@@ -16,9 +16,17 @@ on:
         required: true
         type: string
         description: The version of python to use with relenv
+      source:
+        required: true
+        type: string
+        description: The backend to build the packages with
 
 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
 
 jobs:
   build:
@@ -34,14 +42,13 @@ jobs:
           - x86_64
           - aarch64
         source:
-          - onedir
-          - src
+          - ${{ inputs.source }}
 
     container:
       image: ghcr.io/saltstack/salt-ci-containers/packaging:centosstream-9
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Download Onedir Tarball as an Artifact
         uses: actions/download-artifact@v3
@@ -77,7 +84,7 @@ jobs:
       - name: Build RPM
         run: |
           tools pkg build rpm  --relenv-version=${{ inputs.relenv-version }} --python-version=${{ inputs.python-version }} ${{
-              matrix.source == 'onedir' &&
+              inputs.source == 'onedir' &&
               format('--onedir=salt-{0}-onedir-linux-{1}.tar.xz', inputs.salt-version, matrix.arch)
               ||
               format('--arch={0}', matrix.arch)
@@ -86,7 +93,7 @@ jobs:
       - name: Set Artifact Name
         id: set-artifact-name
         run: |
-          if [ "${{ matrix.source }}" != "src" ]; then
+          if [ "${{ inputs.source }}" != "src" ]; then
             echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-rpm" >> "$GITHUB_OUTPUT"
           else
             echo "artifact-name=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-rpm-from-src" >> "$GITHUB_OUTPUT"

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

@@ -29,6 +29,11 @@ on:
 
 env:
   RELENV_DATA: "${{ github.workspace }}/.relenv"
+  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
 
 jobs:
 
@@ -46,7 +51,13 @@ jobs:
       - linux
       - ${{ matrix.arch }}
     steps:
-      - uses: actions/checkout@v3
+
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t"
+
+      - uses: actions/checkout@v4
 
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
@@ -89,7 +100,14 @@ jobs:
           - amd64
     runs-on: windows-latest
     steps:
-      - uses: actions/checkout@v3
+
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t"
+
+      - uses: actions/checkout@v4
+
       - name: Set up Python 3.10
         uses: actions/setup-python@v4
         with:
@@ -135,7 +153,13 @@ jobs:
           - x86_64
     runs-on: macos-12
     steps:
-      - uses: actions/checkout@v3
+
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t"
+
+      - uses: actions/checkout@v4
       - name: Set up Python 3.10
         uses: actions/setup-python@v4
         with:

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

@@ -24,6 +24,17 @@ on:
         type: string
         description: The GitHub Environment where this workflow should run
         default: ci
+      source:
+        required: true
+        type: string
+        description: The backend to build the packages with
+
+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
 
 jobs:
 
@@ -38,8 +49,7 @@ jobs:
           - x86
           - amd64
         source:
-          - onedir
-          - src
+          - ${{ inputs.source }}
 
     runs-on:
       - windows-latest
@@ -75,7 +85,7 @@ jobs:
             echo "sign-pkgs=false" >> "$GITHUB_OUTPUT"
           fi
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: actions/setup-python@v4
         with:
           python-version: 3.9
@@ -108,7 +118,7 @@ jobs:
       - name: Build Windows Packages
         run: |
           tools pkg build windows --relenv-version=${{ inputs.relenv-version }} --python-version=${{ inputs.python-version }} ${{
-            matrix.source == 'onedir' &&
+            inputs.source == 'onedir' &&
             format(
               '--onedir salt-{0}-onedir-windows-{1}.zip --salt-version {0} --arch {1} {2}',
               inputs.salt-version,
@@ -123,7 +133,7 @@ jobs:
         id: set-artifact-name
         shell: bash
         run: |
-          if [ "${{ matrix.source }}" != "src" ]; then
+          if [ "${{ inputs.source }}" != "src" ]; then
             echo "artifact-name-nsis=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-NSIS" >> "$GITHUB_OUTPUT"
             echo "artifact-name-msi=salt-${{ inputs.salt-version }}-${{ matrix.arch }}-MSI" >> "$GITHUB_OUTPUT"
           else

.github/workflows/lint-action.yml

@@ -34,7 +34,7 @@ jobs:
         run: |
           git config --global --add safe.directory "$(pwd)"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Nox
         run: |
@@ -79,7 +79,7 @@ jobs:
         run: |
           git config --global --add safe.directory "$(pwd)"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install Nox
         run: |

.github/workflows/pre-commit-action.yml

@@ -37,7 +37,7 @@ jobs:
         run: |
           git config --global --add safe.directory "$(pwd)"
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - uses: ./.github/actions/setup-actionlint
         with:
           cache-seed: ${{ inputs.cache-seed }}

.github/workflows/release-tag.yml

@@ -41,7 +41,7 @@ jobs:
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         repository: ${{ github.event.inputs.saltRepo }}
         ref: ${{ github.event.inputs.saltBranch }}
@@ -58,7 +58,7 @@ jobs:
       with:
         python-version: 3.8
 
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - name: Install pypa/build
       run: |
         python -m pip install build --user

.github/workflows/release-update-winrepo.yml

@@ -23,12 +23,12 @@ jobs:
     steps:
 
     - name: Checkout Salt
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: salt
 
     - name: Checkout WinRepo
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
       with:
         path: winrepo
         repository: saltstack/salt-winrepo-ng

.github/workflows/release-upload-virustotal.yml

@@ -16,6 +16,13 @@ on:
 permissions:
   contents: read
 
+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
+
 jobs:
   upload-virustotal:
     name: Upload VirusTotal
@@ -27,7 +34,7 @@ jobs:
     steps:
 
     - name: Checkout Salt
-      uses: actions/checkout@v3
+      uses: actions/checkout@v4
 
     - name: Set Up Python 3.10
       uses: actions/setup-python@v4

.github/workflows/release.yml

@@ -59,7 +59,7 @@ jobs:
       latest-release: ${{ steps.get-salt-releases.outputs.latest-release }}
       releases: ${{ steps.get-salt-releases.outputs.releases }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Full clone to also get the tags to get the right salt version
 
@@ -139,7 +139,7 @@ jobs:
           - platform: darwin
             arch: x86_64
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
@@ -176,7 +176,7 @@ jobs:
 
     steps:
       - name: Clone The Salt Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Rclone
         uses: AnimMouse/setup-rclone@v1
@@ -205,7 +205,7 @@ jobs:
 
     steps:
       - name: Clone The Salt Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Get Salt Project GitHub Actions Bot Environment
         run: |
@@ -233,12 +233,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: almalinux-8
+      nox-session: ci-test-onedir
       platform: linux
       arch: x86_64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -254,12 +256,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: almalinux-8-arm64
+      nox-session: ci-test-onedir
       platform: linux
       arch: aarch64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -275,12 +279,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: almalinux-9
+      nox-session: ci-test-onedir
       platform: linux
       arch: x86_64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -296,12 +302,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: almalinux-9-arm64
+      nox-session: ci-test-onedir
       platform: linux
       arch: aarch64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -317,12 +325,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: amazonlinux-2
+      nox-session: ci-test-onedir
       platform: linux
       arch: x86_64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -338,12 +348,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: amazonlinux-2-arm64
+      nox-session: ci-test-onedir
       platform: linux
       arch: aarch64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -359,12 +371,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: centos-7
+      nox-session: ci-test-onedir
       platform: linux
       arch: x86_64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -380,12 +394,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: centos-7-arm64
+      nox-session: ci-test-onedir
       platform: linux
       arch: aarch64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -401,12 +417,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: centosstream-8
+      nox-session: ci-test-onedir
       platform: linux
       arch: x86_64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -422,12 +440,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: centosstream-8-arm64
+      nox-session: ci-test-onedir
       platform: linux
       arch: aarch64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -443,12 +463,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: centosstream-9
+      nox-session: ci-test-onedir
       platform: linux
       arch: x86_64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -464,12 +486,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: centosstream-9-arm64
+      nox-session: ci-test-onedir
       platform: linux
       arch: aarch64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -485,12 +509,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: debian-10
+      nox-session: ci-test-onedir
       platform: linux
       arch: x86_64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -506,12 +532,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: debian-11
+      nox-session: ci-test-onedir
       platform: linux
       arch: x86_64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -527,12 +555,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: debian-11-arm64
+      nox-session: ci-test-onedir
       platform: linux
       arch: aarch64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -548,12 +578,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: fedora-37
+      nox-session: ci-test-onedir
       platform: linux
       arch: x86_64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -569,12 +601,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: fedora-37-arm64
+      nox-session: ci-test-onedir
       platform: linux
       arch: aarch64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -590,12 +624,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: fedora-38
+      nox-session: ci-test-onedir
       platform: linux
       arch: x86_64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -611,12 +647,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: fedora-38-arm64
+      nox-session: ci-test-onedir
       platform: linux
       arch: aarch64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -632,12 +670,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: photonos-3
+      nox-session: ci-test-onedir
       platform: linux
       arch: x86_64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -653,12 +693,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: photonos-4
+      nox-session: ci-test-onedir
       platform: linux
       arch: x86_64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -674,12 +716,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: photonos-4-arm64
+      nox-session: ci-test-onedir
       platform: linux
       arch: aarch64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -695,12 +739,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: ubuntu-20.04
+      nox-session: ci-test-onedir
       platform: linux
       arch: x86_64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -716,12 +762,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: ubuntu-20.04-arm64
+      nox-session: ci-test-onedir
       platform: linux
       arch: aarch64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -737,12 +785,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: ubuntu-22.04
+      nox-session: ci-test-onedir
       platform: linux
       arch: x86_64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -758,12 +808,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: ubuntu-22.04-arm64
+      nox-session: ci-test-onedir
       platform: linux
       arch: aarch64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
@@ -779,12 +831,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: ubuntu-22.04
+      nox-session: ci-test-onedir
       platform: linux
       arch: x86_64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: onedir
@@ -800,12 +854,14 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: ubuntu-22.04-arm64
+      nox-session: ci-test-onedir
       platform: linux
       arch: aarch64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: release
       nox-version: 2022.8.7
+      python-version: "3.10"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: onedir
@@ -821,6 +877,7 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-macos.yml
     with:
       distro-slug: macos-12
+      nox-session: ci-test-onedir
       platform: darwin
       arch: x86_64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@@ -828,6 +885,7 @@ jobs:
       environment: release
       skip-code-coverage: true
       nox-version: 2022.8.7
+      python-version: "3.10"
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: package
     secrets: inherit
@@ -842,6 +900,7 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-macos.yml
     with:
       distro-slug: macos-12
+      nox-session: ci-test-onedir
       platform: darwin
       arch: x86_64
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13
@@ -849,6 +908,7 @@ jobs:
       environment: release
       skip-code-coverage: true
       nox-version: 2022.8.7
+      python-version: "3.10"
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: onedir
     secrets: inherit
@@ -863,6 +923,7 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-windows.yml
     with:
       distro-slug: windows-2022
+      nox-session: ci-test-onedir
       platform: windows
       arch: amd64
       pkg-type: nsis
@@ -871,6 +932,7 @@ jobs:
       environment: release
       skip-code-coverage: true
       nox-version: 2022.8.7
+      python-version: "3.10"
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
     secrets: inherit
 
@@ -884,6 +946,7 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-windows.yml
     with:
       distro-slug: windows-2022
+      nox-session: ci-test-onedir
       platform: windows
       arch: amd64
       pkg-type: msi
@@ -892,6 +955,7 @@ jobs:
       environment: release
       skip-code-coverage: true
       nox-version: 2022.8.7
+      python-version: "3.10"
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
     secrets: inherit
 
@@ -905,6 +969,7 @@ jobs:
     uses: ./.github/workflows/test-package-downloads-action-windows.yml
     with:
       distro-slug: windows-2022
+      nox-session: ci-test-onedir
       platform: windows
       arch: amd64
       pkg-type: onedir
@@ -913,6 +978,7 @@ jobs:
       environment: release
       skip-code-coverage: true
       nox-version: 2022.8.7
+      python-version: "3.10"
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
     secrets: inherit
 
@@ -963,7 +1029,7 @@ jobs:
     environment: release
     steps:
       - name: Clone The Salt Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ssh-key: ${{ secrets.GHA_SSH_KEY }}
 
@@ -1068,7 +1134,7 @@ jobs:
       - linux
       - repo-release
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts

.github/workflows/templates/build-ci-deps.yml.jinja

@@ -0,0 +1,95 @@
+
+  <%- for slug, display_name, arch in (("windows-2016", "Windows 2016", "amd64"),
+                                       ("windows-2019", "Windows 2019", "amd64"),
+                                       ("windows-2022", "Windows 2022", "amd64")) %>
+
+  <{ slug.replace(".", "") }>-ci-deps:
+    <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %>
+    name: <{ display_name }>
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/build-deps-ci-action.yml
+    with:
+      distro-slug: <{ slug }>
+      nox-session: ci-test-onedir
+      platform: windows
+      arch: amd64
+      nox-version: <{ nox_version  }>
+      python-version: "<{ gh_actions_workflows_python_version }>"
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }>
+
+  <%- endfor %>
+
+  <%- for slug, display_name, arch in (("macos-12", "macOS 12", "x86_64"),) %>
+
+  <{ slug.replace(".", "") }>-ci-deps:
+    <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %>
+    name: <{ display_name }>
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/build-deps-ci-action-macos.yml
+    with:
+      distro-slug: <{ slug }>
+      nox-session: ci-test-onedir
+      platform: darwin
+      arch: x86_64
+      nox-version: <{ nox_version  }>
+      python-version: "<{ gh_actions_workflows_python_version }>"
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }>
+
+  <%- endfor %>
+
+  <%- for slug, display_name, arch in (("almalinux-8", "Alma Linux 8", "x86_64"),
+                                       ("almalinux-8-arm64", "Alma Linux 8 Arm64", "aarch64"),
+                                       ("almalinux-9", "Alma Linux 9", "x86_64"),
+                                       ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64"),
+                                       ("amazonlinux-2", "Amazon Linux 2", "x86_64"),
+                                       ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64"),
+                                       ("archlinux-lts", "Arch Linux LTS", "x86_64"),
+                                       ("centos-7", "CentOS 7", "x86_64"),
+                                       ("centos-7-arm64", "CentOS 7 Arm64", "aarch64"),
+                                       ("centosstream-8", "CentOS Stream 8", "x86_64"),
+                                       ("centosstream-8-arm64", "CentOS Stream 8 Arm64", "aarch64"),
+                                       ("centosstream-9", "CentOS Stream 9", "x86_64"),
+                                       ("centosstream-9-arm64", "CentOS Stream 9 Arm64", "aarch64"),
+                                       ("debian-10", "Debian 10", "x86_64"),
+                                       ("debian-11", "Debian 11", "x86_64"),
+                                       ("debian-11-arm64", "Debian 11 Arm64", "aarch64"),
+                                       ("fedora-37", "Fedora 37", "x86_64"),
+                                       ("fedora-37-arm64", "Fedora 37 Arm64", "aarch64"),
+                                       ("fedora-38", "Fedora 38", "x86_64"),
+                                       ("fedora-38-arm64", "Fedora 38 Arm64", "aarch64"),
+                                       ("opensuse-15", "Opensuse 15", "x86_64"),
+                                       ("photonos-3", "Photon OS 3", "x86_64"),
+                                       ("photonos-4", "Photon OS 4", "x86_64"),
+                                       ("photonos-4-arm64", "Photon OS 4 Arm64", "aarch64"),
+                                       ("ubuntu-20.04", "Ubuntu 20.04", "x86_64"),
+                                       ("ubuntu-20.04-arm64", "Ubuntu 20.04 Arm64", "aarch64"),
+                                       ("ubuntu-22.04", "Ubuntu 22.04", "x86_64"),
+                                       ("ubuntu-22.04-arm64", "Ubuntu 22.04 Arm64", "aarch64")) %>
+
+  <{ slug.replace(".", "") }>-ci-deps:
+    <%- do test_salt_needs.append(slug.replace(".", "") + "-ci-deps") %>
+    name: <{ display_name }>
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-salt-onedir
+    uses: ./.github/workflows/build-deps-ci-action.yml
+    with:
+      distro-slug: <{ slug }>
+      nox-session: ci-test-onedir
+      platform: linux
+      arch: <{ arch }>
+      nox-version: <{ nox_version  }>
+      python-version: "<{ gh_actions_workflows_python_version }>"
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }>
+
+  <%- endfor %>

.github/workflows/templates/build-deb-repo.yml.jinja

@@ -19,7 +19,7 @@
         <%- endfor %>
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Download System Dependencies
         run: |

.github/workflows/templates/build-macos-repo.yml.jinja

@@ -1,6 +1,6 @@
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts

.github/workflows/templates/build-onedir-repo.yml.jinja

@@ -1,6 +1,6 @@
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts

.github/workflows/templates/build-packages.yml.jinja

@@ -5,10 +5,14 @@
                                                   ("macos", "macOS", "github-hosted"),
                                                 ) %>
 
-  <%- set job_name = "build-{}-pkgs".format(pkg_type) %>
+  <%- for backend in ("onedir", "src") %>
+  <%- set job_name = "build-{}-pkgs-{}".format(pkg_type, backend) %>
+  <%- if backend == "src" %>
+    <%- do conclusion_needs.append(job_name) %>
+  <%- endif %>
 
   <{ job_name }>:
-    name: Build <{ display_name }> Packages
+    name: Build Packages
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-pkgs'] && fromJSON(needs.prepare-workflow.outputs.runners)['<{ runner_type }>'] }}
     needs:
       - prepare-workflow
@@ -18,6 +22,7 @@
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       relenv-version: "<{ relenv_version }>"
       python-version: "<{ python_version }>"
+      source: "<{ backend }>"
     <%- if pkg_type in ("macos", "windows") and gh_environment %>
       environment: <{ gh_environment }>
       <%- if pkg_type == "macos" %>
@@ -28,4 +33,5 @@
     secrets: inherit
     <%- endif %>
 
+  <%- endfor %>
 <%- endfor %>

.github/workflows/templates/build-repos.yml.jinja

@@ -20,7 +20,7 @@
     needs:
       - prepare-workflow
       <%- if needs_pkg %>
-      - build-<{ type }>-pkgs
+      - build-<{ type }>-pkgs-onedir
       <%- else %>
       - build-salt-onedir
       <%- endif %>

.github/workflows/templates/build-rpm-repo.yml.jinja

@@ -29,7 +29,7 @@
         <%- endfor %>
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Download System Dependencies
         run: |

.github/workflows/templates/build-src-repo.yml.jinja

@@ -1,6 +1,6 @@
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts

.github/workflows/templates/build-windows-repo.yml.jinja

@@ -1,6 +1,6 @@
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts

.github/workflows/templates/ci.yml.jinja

@@ -57,7 +57,7 @@
     needs:
       - prepare-workflow
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get Python Version
         id: get-python-version
@@ -220,7 +220,7 @@
       - prepare-release
     runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "medium", "x86_64"]') || 'ubuntu-latest' }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python 3.10
         uses: actions/setup-python@v4
@@ -306,15 +306,18 @@
   <%- include "build-packages.yml.jinja" %>
   <%- endif %>
 
+  <%- set pkg_tests_job_name = "pkg-tests" %>
+  <%- set salt_tests_job_name = "salt-tests" %>
+  <%- if includes.get(pkg_tests_job_name, True) or includes.get(salt_tests_job_name, True) %>
+  <%- include "build-ci-deps.yml.jinja" %>
+  <%- endif %>
 
-  <%- set job_name = "pkg-tests" %>
-  <%- if includes.get(job_name, True) %>
+  <%- if includes.get(pkg_tests_job_name, True) %>
   <%- include "test-salt-pkg.yml.jinja" %>
   <%- endif %>
 
 
-  <%- set job_name = "salt-tests" %>
-  <%- if includes.get(job_name, True) %>
+  <%- if includes.get(salt_tests_job_name, True) %>
   <%- include "test-salt.yml.jinja" %>
   <%- endif %>
 
@@ -331,7 +334,7 @@
       - <{ need }>
       <%- endfor %>
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python 3.10
         if: ${{ github.event.repository.private == false }}

.github/workflows/templates/layout.yml.jinja

@@ -9,6 +9,7 @@
 <%- set skip_junit_reports_check = skip_junit_reports_check|default("${{ github.event_name == 'pull_request' }}") %>
 <%- set gpg_key_id = "64CBBC8173D76B3F" %>
 <%- set prepare_actual_release = prepare_actual_release | default(False) %>
+<%- set gh_actions_workflows_python_version = "3.10" %>
 ---
 <%- block name %>
 name: <{ workflow_name }>
@@ -97,7 +98,7 @@ jobs:
       release-changelog-target: ${{ steps.get-release-changelog-target.outputs.release-changelog-target }}
       testing-releases: ${{ steps.get-testing-releases.outputs.testing-releases }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Full clone to also get the tags to get the right salt version
 

.github/workflows/templates/nightly.yml.jinja

@@ -157,7 +157,7 @@ concurrency:
       <%- endif %>
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get Salt Project GitHub Actions Bot Environment
         run: |

.github/workflows/templates/release.yml.jinja

@@ -87,7 +87,7 @@ permissions:
       latest-release: ${{ steps.get-salt-releases.outputs.latest-release }}
       releases: ${{ steps.get-salt-releases.outputs.releases }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           fetch-depth: 0  # Full clone to also get the tags to get the right salt version
 
@@ -173,7 +173,7 @@ permissions:
           - platform: darwin
             arch: x86_64
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
@@ -210,7 +210,7 @@ permissions:
 
     steps:
       - name: Clone The Salt Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Rclone
         uses: AnimMouse/setup-rclone@v1
@@ -240,7 +240,7 @@ permissions:
 
     steps:
       - name: Clone The Salt Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Get Salt Project GitHub Actions Bot Environment
         run: |
@@ -280,7 +280,7 @@ permissions:
     environment: <{ gh_environment }>
     steps:
       - name: Clone The Salt Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ssh-key: ${{ secrets.GHA_SSH_KEY }}
 
@@ -391,7 +391,7 @@ permissions:
     environment: <{ gh_environment }>
     steps:
       - name: Clone The Salt Repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           ssh-key: ${{ secrets.GHA_SSH_KEY }}
 
@@ -422,7 +422,7 @@ permissions:
       - linux
       - repo-<{ gh_environment }>
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts

.github/workflows/templates/staging.yml.jinja

@@ -94,7 +94,7 @@ concurrency:
       - linux
       - repo-<{ gh_environment }>
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Get Salt Project GitHub Actions Bot Environment
         run: |
@@ -183,7 +183,7 @@ concurrency:
       - linux
       - repo-<{ gh_environment }>
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts

.github/workflows/templates/test-pkg-repo-downloads.yml.jinja

@@ -51,12 +51,14 @@
     uses: ./.github/workflows/test-package-downloads-action-linux.yml
     with:
       distro-slug: <{ slug }>
+      nox-session: ci-test-onedir
       platform: linux
       arch: <{ arch }>
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }>
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       environment: <{ gh_environment }>
       nox-version: <{ nox_version  }>
+      python-version: "<{ gh_actions_workflows_python_version }>"
       skip-code-coverage: true
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: <{ pkg_type.lower() }>
@@ -88,6 +90,7 @@
     uses: ./.github/workflows/test-package-downloads-action-macos.yml
     with:
       distro-slug: <{ slug }>
+      nox-session: ci-test-onedir
       platform: darwin
       arch: <{ arch }>
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }>
@@ -95,6 +98,7 @@
       environment: <{ gh_environment }>
       skip-code-coverage: true
       nox-version: <{ nox_version  }>
+      python-version: "<{ gh_actions_workflows_python_version }>"
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
       pkg-type: <{ pkg_type.lower() }>
     secrets: inherit
@@ -124,6 +128,7 @@
     uses: ./.github/workflows/test-package-downloads-action-windows.yml
     with:
       distro-slug: <{ slug }>
+      nox-session: ci-test-onedir
       platform: windows
       arch: <{ arch }>
       pkg-type: <{ pkg_type.lower() }>
@@ -132,6 +137,7 @@
       environment: <{ gh_environment }>
       skip-code-coverage: true
       nox-version: <{ nox_version  }>
+      python-version: "<{ gh_actions_workflows_python_version }>"
       latest-release: "${{ needs.prepare-workflow.outputs.latest-release }}"
     secrets: inherit
     <%- endfor %>

.github/workflows/templates/test-salt-pkg.yml.jinja

@@ -39,19 +39,22 @@
 
   <{ job_name }>:
     <%- do test_salt_pkg_needs.append(job_name) %>
-    name: <{ display_name }> Package Tests
+    name: <{ display_name }>
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-<{ pkg_type }>-pkgs
+      - build-<{ pkg_type }>-pkgs-onedir
+      - <{ slug.replace(".", "") }>-ci-deps
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: <{ slug }>
+      nox-session: ci-test-onedir
       platform: linux
       arch: <{ arch }>
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: <{ pkg_type }>
       nox-version: <{ nox_version  }>
+      python-version: "<{ gh_actions_workflows_python_version }>"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }>
       skip-code-coverage: <{ skip_test_coverage_check }>
       skip-junit-reports: <{ skip_junit_reports_check }>
@@ -66,19 +69,22 @@
 
   <{ job_name }>:
     <%- do test_salt_pkg_needs.append(job_name) %>
-    name: <{ display_name }> Package Tests
+    name: <{ display_name }>
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
-      - build-macos-pkgs
+      - build-macos-pkgs-onedir
+      - <{ slug.replace(".", "") }>-ci-deps
     uses: ./.github/workflows/test-packages-action-macos.yml
     with:
       distro-slug: <{ slug }>
+      nox-session: ci-test-onedir
       platform: darwin
       arch: <{ arch }>
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: macos
       nox-version: <{ nox_version  }>
+      python-version: "<{ gh_actions_workflows_python_version }>"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }>
       skip-code-coverage: <{ skip_test_coverage_check }>
       skip-junit-reports: <{ skip_junit_reports_check }>
@@ -95,19 +101,22 @@
 
   <{ job_name }>:
     <%- do test_salt_pkg_needs.append(job_name) %>
-    name: <{ display_name }> <{ pkg_type }> Package Tests
+    name: <{ display_name }>
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-windows-pkgs
+      - build-windows-pkgs-onedir
+      - <{ slug.replace(".", "") }>-ci-deps
     uses: ./.github/workflows/test-packages-action.yml
     with:
       distro-slug: <{ slug }>
+      nox-session: ci-test-onedir
       platform: windows
       arch: <{ arch }>
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       pkg-type: <{ pkg_type }>
       nox-version: <{ nox_version  }>
+      python-version: "<{ gh_actions_workflows_python_version }>"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }>
       skip-code-coverage: <{ skip_test_coverage_check }>
       skip-junit-reports: <{ skip_junit_reports_check }>

.github/workflows/templates/test-salt.yml.jinja

@@ -9,7 +9,7 @@
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir
+      - <{ slug.replace(".", "") }>-ci-deps
     uses: ./.github/workflows/test-action.yml
     with:
       distro-slug: <{ slug }>
@@ -17,6 +17,7 @@
       platform: windows
       arch: amd64
       nox-version: <{ nox_version  }>
+      python-version: "<{ gh_actions_workflows_python_version }>"
       testrun: ${{ needs.prepare-workflow.outputs.testrun }}
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }>
@@ -33,7 +34,7 @@
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir
+      - <{ slug.replace(".", "") }>-ci-deps
     uses: ./.github/workflows/test-action-macos.yml
     with:
       distro-slug: <{ slug }>
@@ -41,6 +42,7 @@
       platform: darwin
       arch: x86_64
       nox-version: <{ nox_version  }>
+      python-version: "<{ gh_actions_workflows_python_version }>"
       testrun: ${{ needs.prepare-workflow.outputs.testrun }}
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }>
@@ -76,7 +78,7 @@
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
-      - build-salt-onedir
+      - <{ slug.replace(".", "") }>-ci-deps
     uses: ./.github/workflows/test-action.yml
     with:
       distro-slug: <{ slug }>
@@ -84,6 +86,7 @@
       platform: linux
       arch: <{ arch }>
       nox-version: <{ nox_version  }>
+      python-version: "<{ gh_actions_workflows_python_version }>"
       testrun: ${{ needs.prepare-workflow.outputs.testrun }}
       salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
       cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|<{ python_version }>

.github/workflows/test-action-macos.yml

@@ -20,7 +20,7 @@ on:
         required: false
         type: string
         description: The python version to run tests with
-        default: "3.9"
+        default: "3.11"
       salt-version:
         type: string
         required: true
@@ -57,7 +57,6 @@ on:
         description: Skip Publishing JUnit Reports
         default: false
 
-
 env:
   COLUMNS: 190
   PIP_INDEX_URL: "https://pypi-proxy.saltstack.net/root/local/+simple/"
@@ -66,14 +65,19 @@ env:
 jobs:
 
   generate-matrix:
-    name: Generate Test Matrix
+    name: Test Matrix
     runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }}
     outputs:
       matrix-include: ${{ steps.generate-matrix.outputs.matrix }}
-      transport-matrix-include: ${{ steps.generate-transport-matrix.outputs.matrix }}
     steps:
+
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
+
       - name: Checkout Source Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
@@ -85,119 +89,22 @@ jobs:
           echo "$TEST_MATRIX"
           echo "matrix=$TEST_MATRIX" >> "$GITHUB_OUTPUT"
 
-      - name: Generate Transport Matrix
-        id: generate-transport-matrix
-        run: |
-          TRANSPORT_MATRIX=$(tools ci transport-matrix ${{ inputs.distro-slug }})
-          echo "$TRANSPORT_MATRIX"
-          echo "matrix=$TRANSPORT_MATRIX" >> "$GITHUB_OUTPUT"
-
-  dependencies:
-    name: Setup Test Dependencies
-    runs-on: ${{ inputs.distro-slug }}
-    timeout-minutes: 90
-    needs:
-      - generate-matrix
-    strategy:
-      fail-fast: false
-      matrix:
-        include: ${{ fromJSON(needs.generate-matrix.outputs.transport-matrix-include) }}
-    steps:
-      - name: Checkout Source Code
-        uses: actions/checkout@v3
-
-      - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
-        id: nox-dependencies-cache
-        uses: actions/cache@v3
-        with:
-          path: nox.${{ inputs.distro-slug }}.tar.*
-          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ matrix.transport }}|${{ inputs.python-version }}|${{ hashFiles('requirements/**/*.txt', 'noxfile.py') }}
-
-      - name: Download Onedir Tarball as an Artifact
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
-          path: artifacts/
-
-      - name: Decompress Onedir Tarball
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        shell: bash
-        run: |
-          python3 -c "import os; os.makedirs('artifacts', exist_ok=True)"
-          cd artifacts
-          tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
-
-      - name: Set up Python ${{ inputs.python-version }}
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        uses: actions/setup-python@v4
-        with:
-          python-version: "${{ inputs.python-version }}"
-
-      - name: Install System Dependencies
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          brew install openssl@3
-
-      - name: Install Nox
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          python3 -m pip install 'nox==${{ inputs.nox-version }}'
-
-      - name: Define Nox Session
-        id: define-nox-session
-        run: |
-          if [ "${{ matrix.transport }}" != "tcp" ]; then
-            echo NOX_SESSION=${{ inputs.nox-session}} >> "$GITHUB_ENV"
-            echo "nox-session=${{ inputs.nox-session}}" >> "$GITHUB_OUTPUT"
-          else
-            echo NOX_SESSION=${{ inputs.nox-session}}-tcp >> "$GITHUB_ENV"
-            echo "nox-session=${{ inputs.nox-session}}-tcp" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: Install Dependencies
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        env:
-          PRINT_TEST_SELECTION: "0"
-          PRINT_SYSTEM_INFO: "0"
-        run: |
-          export PYCURL_SSL_LIBRARY=openssl
-          export LDFLAGS="-L/usr/local/opt/openssl@3/lib"
-          export CPPFLAGS="-I/usr/local/opt/openssl@3/include"
-          export PKG_CONFIG_PATH="/usr/local/opt/openssl@3/lib/pkgconfig"
-          nox --install-only -e ${{ env.NOX_SESSION }}
-
-      - name: Cleanup .nox Directory
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          nox -e "pre-archive-cleanup(pkg=False)"
-
-      - name: Compress .nox Directory
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          nox -e compress-dependencies -- ${{ inputs.distro-slug }}
-
-      - name: Upload Nox Requirements Tarball
-        uses: actions/upload-artifact@v3
-        with:
-          name: nox-${{ inputs.distro-slug }}-${{ steps.define-nox-session.outputs.nox-session }}
-          path: nox.${{ inputs.distro-slug }}.tar.*
-
   test:
     name: Test
     runs-on: ${{ inputs.distro-slug }}
     timeout-minutes: 360  # 6 Hours
     needs:
       - generate-matrix
-      - dependencies
     strategy:
       fail-fast: false
       matrix:
         include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include) }}
+    env:
+      SALT_TRANSPORT: ${{ matrix.transport }}
 
     steps:
       - name: Checkout Source Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Salt Version
         run: |
@@ -224,7 +131,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: nox.${{ inputs.distro-slug }}.tar.*
-          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ matrix.transport }}|${{ inputs.python-version }}|${{ hashFiles('requirements/**/*.txt', 'noxfile.py') }}
+          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
+              hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py')
+            }}
           # If we get a cache miss here it means the dependencies step failed to save the cache
           fail-on-cache-miss: true
 
@@ -241,14 +150,6 @@ jobs:
         run: |
           nox -e decompress-dependencies -- ${{ inputs.distro-slug }}
 
-      - name: Define Nox Session
-        run: |
-          if [ "${{ matrix.transport }}" != "tcp" ]; then
-            echo NOX_SESSION=${{ inputs.nox-session}} >> "$GITHUB_ENV"
-          else
-            echo NOX_SESSION=${{ inputs.nox-session}}-tcp >> "$GITHUB_ENV"
-          fi
-
       - name: Download testrun-changed-files.txt
         if: ${{ fromJSON(inputs.testrun)['type'] != 'full' }}
         uses: actions/download-artifact@v3
@@ -265,7 +166,7 @@ jobs:
           SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
           SKIP_CODE_COVERAGE: "1"
         run: |
-          sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- -k "mac or darwin"
+          sudo -E nox -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- -k "mac or darwin"
 
       - name: Run Fast/Changed Tests
         id: run-fast-changed-tests
@@ -281,7 +182,7 @@ jobs:
           SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
           COVERAGE_CONTEXT: ${{ inputs.distro-slug }}
         run: |
-          sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \
+          sudo -E nox -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
             -k "mac or darwin" --suppress-no-test-exit-code \
             --from-filenames=testrun-changed-files.txt
 
@@ -299,7 +200,7 @@ jobs:
           SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
           COVERAGE_CONTEXT: ${{ inputs.distro-slug }}
         run: |
-          sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \
+          sudo -E nox -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
             -k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --slow-tests \
             --from-filenames=testrun-changed-files.txt
 
@@ -317,7 +218,7 @@ jobs:
           SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
           COVERAGE_CONTEXT: ${{ inputs.distro-slug }}
         run: |
-          sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \
+          sudo -E nox -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
             -k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --core-tests \
             --from-filenames=testrun-changed-files.txt
 
@@ -335,7 +236,7 @@ jobs:
           SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
           COVERAGE_CONTEXT: ${{ inputs.distro-slug }}
         run: |
-          sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \
+          sudo -E nox -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
             -k "mac or darwin" --suppress-no-test-exit-code
 
       - name: Run Slow Tests
@@ -352,7 +253,7 @@ jobs:
           SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
           COVERAGE_CONTEXT: ${{ inputs.distro-slug }}
         run: |
-          sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \
+          sudo -E nox -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
             -k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --slow-tests
 
       - name: Run Core Tests
@@ -369,7 +270,7 @@ jobs:
           SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
           COVERAGE_CONTEXT: ${{ inputs.distro-slug }}
         run: |
-          sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \
+          sudo -E nox -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
             -k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --core-tests
 
       - name: Run Flaky Tests
@@ -386,7 +287,7 @@ jobs:
           SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
           COVERAGE_CONTEXT: ${{ inputs.distro-slug }}
         run: |
-          sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \
+          sudo -E nox -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
             -k "mac or darwin" --suppress-no-test-exit-code --no-fast-tests --flaky-jail
 
       - name: Run Full Tests
@@ -403,7 +304,7 @@ jobs:
           SKIP_CODE_COVERAGE: "${{ inputs.skip-code-coverage && '1' || '0' }}"
           COVERAGE_CONTEXT: ${{ inputs.distro-slug }}
         run: |
-          sudo -E nox -e ${{ env.NOX_SESSION }} -- ${{ matrix.tests-chunk }} -- \
+          sudo -E nox -e ${{ inputs.nox-session }} -- ${{ matrix.tests-chunk }} -- \
             --slow-tests --core-tests -k "mac or darwin"
 
       - name: Fix file ownership
@@ -429,15 +330,15 @@ jobs:
           rm -rf artifacts/salt*
           tree -a artifacts
           if [ "${{ inputs.skip-code-coverage }}" != "true" ]; then
-            mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }}
-            echo "COVERAGE_FILE=artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }}" >> GITHUB_ENV
+            mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.${{ matrix.transport }}.${{ matrix.tests-chunk }}
+            echo "COVERAGE_FILE=artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.${{ matrix.transport }}.${{ matrix.tests-chunk }}" >> GITHUB_ENV
           fi
 
       - name: Upload Code Coverage Test Run Artifacts
         if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled'
         uses: actions/upload-artifact@v3
         with:
-          name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }}
+          name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
           path: |
             artifacts/coverage/
 
@@ -453,7 +354,7 @@ jobs:
         if: always() && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled'
         uses: actions/upload-artifact@v3
         with:
-          name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }}
+          name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}
           path: |
             artifacts/xml-unittests-output/
 
@@ -461,50 +362,39 @@ jobs:
         if: always() && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled'
         uses: actions/upload-artifact@v3
         with:
-          name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }}
+          name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}
           path: |
             artifacts/logs
 
+      - name: Publish Test Report
+        uses: mikepenz/action-junit-report@v3
+        # always run even if the previous steps fails
+        if: always() && inputs.skip-junit-reports == false
+        with:
+          check_name: Test Results(${{ inputs.distro-slug }}, transport=${{ matrix.transport }}, tests-chunk=${{ matrix.tests-chunk }})
+          report_paths: 'artifacts/xml-unittests-output/*.xml'
+          annotate_only: true
+
 
   report:
-    name: Reports for ${{ inputs.distro-slug }}(${{ matrix.transport }})
-    if: always() && (inputs.skip-code-coverage == false || inputs.skip-junit-reports == false) && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
+    name: Test Reports
+    if: always() && inputs.skip-code-coverage == false && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
     runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }}
     needs:
-      - generate-matrix
       - test
-    strategy:
-      fail-fast: false
-      matrix:
-        include: ${{ fromJSON(needs.generate-matrix.outputs.transport-matrix-include) }}
 
     steps:
       - name: Checkout Source Code
-        uses: actions/checkout@v3
-
-      - name: Define Nox Session
-        run: |
-          if [ "${{ matrix.transport }}" != "tcp" ]; then
-            echo NOX_SESSION=${{ inputs.nox-session }} >> "$GITHUB_ENV"
-          else
-            echo NOX_SESSION=${{ inputs.nox-session }}-tcp >> "$GITHUB_ENV"
-          fi
+        uses: actions/checkout@v4
 
       - name: Download Code Coverage Test Run Artifacts
         uses: actions/download-artifact@v3
         if: ${{ inputs.skip-code-coverage == false }}
         id: download-coverage-artifacts
         with:
-          name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }}
+          name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
           path: artifacts/coverage/
 
-      - name: Download JUnit XML Test Run Artifacts
-        uses: actions/download-artifact@v3
-        id: download-junit-artifacts
-        with:
-          name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }}
-          path: artifacts/xml-unittests-output/
-
       - name: Show Downloaded Test Run Artifacts
         run: |
           tree -a artifacts
@@ -548,12 +438,3 @@ jobs:
         continue-on-error: true
         run: |
           nox --force-color -e report-coverage
-
-      - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v3
-        # always run even if the previous steps fails
-        if: always() && inputs.skip-junit-reports == false && steps.download-junit-artifacts.outcome == 'success'
-        with:
-          check_name: Test Results(${{ inputs.distro-slug }})
-          report_paths: 'artifacts/xml-unittests-output/*.xml'
-          annotate_only: true

.github/workflows/test-action.yml

@@ -36,6 +36,11 @@ on:
         required: true
         type: string
         description: The nox version to install
+      python-version:
+        required: false
+        type: string
+        description: The python version to run tests with
+        default: "3.10"
       package-name:
         required: false
         type: string
@@ -52,7 +57,6 @@ on:
         description: Skip Publishing JUnit Reports
         default: false
 
-
 env:
   COLUMNS: 190
   AWS_MAX_ATTEMPTS: "10"
@@ -63,17 +67,22 @@ env:
 jobs:
 
   generate-matrix:
-    name: Generate Test Matrix
+    name: Test Matrix
     runs-on:
       - self-hosted
       - linux
       - x86_64
     outputs:
       matrix-include: ${{ steps.generate-matrix.outputs.matrix }}
-      transport-matrix-include: ${{ steps.generate-transport-matrix.outputs.matrix }}
     steps:
+
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
+
       - name: Checkout Source Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
@@ -85,126 +94,6 @@ jobs:
           echo "$TEST_MATRIX"
           echo "matrix=$TEST_MATRIX" >> "$GITHUB_OUTPUT"
 
-      - name: Generate Transport Matrix
-        id: generate-transport-matrix
-        run: |
-          TRANSPORT_MATRIX=$(tools ci transport-matrix ${{ inputs.distro-slug }})
-          echo "$TRANSPORT_MATRIX"
-          echo "matrix=$TRANSPORT_MATRIX" >> "$GITHUB_OUTPUT"
-
-  dependencies:
-    name: Setup Test Dependencies
-    needs:
-      - generate-matrix
-    runs-on:
-      - self-hosted
-      - linux
-      - bastion
-    timeout-minutes: 90
-    strategy:
-      fail-fast: false
-      matrix:
-        include: ${{ fromJSON(needs.generate-matrix.outputs.transport-matrix-include) }}
-    steps:
-      - name: Checkout Source Code
-        uses: actions/checkout@v3
-
-      - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
-        id: nox-dependencies-cache
-        uses: actions/cache@v3
-        with:
-          path: nox.${{ inputs.distro-slug }}.tar.*
-          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ matrix.transport }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }}
-
-      - name: Download Onedir Tarball as an Artifact
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
-          path: artifacts/
-
-      - name: Decompress Onedir Tarball
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        shell: bash
-        run: |
-          python3 -c "import os; os.makedirs('artifacts', exist_ok=True)"
-          cd artifacts
-          tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
-
-      - 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
-
-      - name: Setup Python Tools Scripts
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        uses: ./.github/actions/setup-python-tools-scripts
-
-      - name: Define Nox Session
-        id: define-nox-session
-        run: |
-          if [ "${{ matrix.transport }}" != "tcp" ]; then
-            echo NOX_SESSION=${{ inputs.nox-session}} >> "$GITHUB_ENV"
-            echo "nox-session=${{ inputs.nox-session}}" >> "$GITHUB_OUTPUT"
-          else
-            echo NOX_SESSION=${{ inputs.nox-session}}-tcp >> "$GITHUB_ENV"
-            echo "nox-session=${{ inputs.nox-session}}-tcp" >> "$GITHUB_OUTPUT"
-          fi
-
-      - name: Get Salt Project GitHub Actions Bot Environment
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30")
-          SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment)
-          echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV"
-
-      - name: Start VM
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        id: spin-up-vm
-        run: |
-          tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ inputs.distro-slug }}
-
-      - name: List Free Space
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm ssh ${{ inputs.distro-slug }} -- df -h || true
-
-      - name: Upload Checkout To VM
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm rsync ${{ inputs.distro-slug }}
-
-      - name: Install Dependencies
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm install-dependencies --nox-session=${{ env.NOX_SESSION }} ${{ inputs.distro-slug }}
-
-      - name: Cleanup .nox Directory
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm pre-archive-cleanup ${{ inputs.distro-slug }}
-
-      - name: Compress .nox Directory
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm compress-dependencies ${{ inputs.distro-slug }}
-
-      - name: Download Compressed .nox Directory
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm download-dependencies ${{ inputs.distro-slug }}
-
-      - name: Destroy VM
-        if: always() && steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }}
-
-      - name: Upload Nox Requirements Tarball
-        uses: actions/upload-artifact@v3
-        with:
-          name: nox-${{ inputs.distro-slug }}-${{ steps.define-nox-session.outputs.nox-session }}
-          path: nox.${{ inputs.distro-slug }}.tar.*
-
   test:
     name: Test
     runs-on:
@@ -213,16 +102,17 @@ jobs:
       - bastion
     timeout-minutes: 300  # 5 Hours - More than this and something is wrong
     needs:
-      - dependencies
       - generate-matrix
     strategy:
       fail-fast: false
       matrix:
         include: ${{ fromJSON(needs.generate-matrix.outputs.matrix-include) }}
+    env:
+      SALT_TRANSPORT: ${{ matrix.transport }}
 
     steps:
       - name: Checkout Source Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Salt Version
         run: |
@@ -245,7 +135,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: nox.${{ inputs.distro-slug }}.tar.*
-          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ matrix.transport }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }}
+          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
+              hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py')
+            }}
           # If we get a cache miss here it means the dependencies step failed to save the cache
           fail-on-cache-miss: true
 
@@ -256,14 +148,6 @@ jobs:
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
 
-      - name: Define Nox Session
-        run: |
-          if [ "${{ matrix.transport }}" != "tcp" ]; then
-            echo NOX_SESSION=${{ inputs.nox-session }} >> "$GITHUB_ENV"
-          else
-            echo NOX_SESSION=${{ inputs.nox-session }}-tcp >> "$GITHUB_ENV"
-          fi
-
       - name: Download testrun-changed-files.txt
         if: ${{ fromJSON(inputs.testrun)['type'] != 'full' }}
         uses: actions/download-artifact@v3
@@ -298,7 +182,7 @@ jobs:
       - name: Show System Info & Test Plan
         run: |
           tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \
-            --nox-session=${{ env.NOX_SESSION }} ${{ inputs.distro-slug }} \
+            --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} \
             ${{ matrix.tests-chunk }}
 
       - name: Run Fast/Changed Tests
@@ -306,7 +190,7 @@ jobs:
         if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && fromJSON(inputs.testrun)['selected_tests']['fast'] == false }}
         run: |
           tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
-            --nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ inputs.distro-slug }} \
+            --nox-session=${{ inputs.nox-session }} --rerun-failures -E SALT_TRANSPORT ${{ inputs.distro-slug }} \
             ${{ matrix.tests-chunk }} -- --suppress-no-test-exit-code \
             --from-filenames=testrun-changed-files.txt
 
@@ -315,7 +199,7 @@ jobs:
         if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && fromJSON(inputs.testrun)['selected_tests']['slow'] == false }}
         run: |
           tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
-            --nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ inputs.distro-slug }} \
+            --nox-session=${{ inputs.nox-session }} --rerun-failures -E SALT_TRANSPORT ${{ inputs.distro-slug }} \
             ${{ matrix.tests-chunk }} -- --no-fast-tests --slow-tests --suppress-no-test-exit-code \
             --from-filenames=testrun-changed-files.txt
 
@@ -324,7 +208,7 @@ jobs:
         if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && fromJSON(inputs.testrun)['selected_tests']['core'] == false }}
         run: |
           tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
-            --nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ inputs.distro-slug }} \
+            --nox-session=${{ inputs.nox-session }} --rerun-failures -E SALT_TRANSPORT ${{ inputs.distro-slug }} \
             ${{ matrix.tests-chunk }} -- --no-fast-tests --core-tests --suppress-no-test-exit-code \
             --from-filenames=testrun-changed-files.txt
 
@@ -333,7 +217,7 @@ jobs:
         if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && fromJSON(inputs.testrun)['selected_tests']['fast'] }}
         run: |
           tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
-            --nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ (inputs.skip-code-coverage && matrix.tests-chunk != 'unit') && '--skip-code-coverage' || '' }} \
+            --nox-session=${{ inputs.nox-session }} --rerun-failures -E SALT_TRANSPORT ${{ (inputs.skip-code-coverage && matrix.tests-chunk != 'unit') && '--skip-code-coverage' || '' }} \
             ${{ inputs.distro-slug }} ${{ matrix.tests-chunk }}
 
       - name: Run Slow Tests
@@ -341,7 +225,7 @@ jobs:
         if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && fromJSON(inputs.testrun)['selected_tests']['slow'] }}
         run: |
           tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
-            --nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ inputs.distro-slug }} \
+            --nox-session=${{ inputs.nox-session }} --rerun-failures -E SALT_TRANSPORT ${{ inputs.distro-slug }} \
             ${{ matrix.tests-chunk }} -- --no-fast-tests --slow-tests
 
       - name: Run Core Tests
@@ -349,7 +233,7 @@ jobs:
         if: ${{ fromJSON(inputs.testrun)['type'] != 'full' && fromJSON(inputs.testrun)['selected_tests']['core'] }}
         run: |
           tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
-            --nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ inputs.distro-slug }} \
+            --nox-session=${{ inputs.nox-session }} --rerun-failures -E SALT_TRANSPORT ${{ inputs.distro-slug }} \
             ${{ matrix.tests-chunk }} -- --no-fast-tests --core-tests
 
       - name: Run Flaky Tests
@@ -357,7 +241,7 @@ jobs:
         if: ${{ fromJSON(inputs.testrun)['selected_tests']['flaky'] }}
         run: |
           tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
-            --nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ inputs.distro-slug }} \
+            --nox-session=${{ inputs.nox-session }} --rerun-failures -E SALT_TRANSPORT ${{ inputs.distro-slug }} \
             ${{ matrix.tests-chunk }} -- --no-fast-tests --flaky-jail
 
       - name: Run Full Tests
@@ -365,7 +249,7 @@ jobs:
         if: ${{ fromJSON(inputs.testrun)['type'] == 'full' }}
         run: |
           tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
-            --nox-session=${{ env.NOX_SESSION }} --rerun-failures ${{ (inputs.skip-code-coverage && matrix.tests-chunk != 'unit') && '--skip-code-coverage' || '' }} \
+            --nox-session=${{ inputs.nox-session }} --rerun-failures -E SALT_TRANSPORT ${{ (inputs.skip-code-coverage && matrix.tests-chunk != 'unit') && '--skip-code-coverage' || '' }} \
             ${{ inputs.distro-slug }} ${{ matrix.tests-chunk }} -- --slow-tests --core-tests
 
       - name: Combine Coverage Reports
@@ -388,8 +272,8 @@ jobs:
           rm -rf artifacts/salt*
           tree -a artifacts
           if [ "${{ inputs.skip-code-coverage }}" != "true" ]; then
-            mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }}
-            echo "COVERAGE_FILE=artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ env.NOX_SESSION }}.${{ matrix.tests-chunk }}" >> GITHUB_ENV
+            mv artifacts/coverage/.coverage artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.${{ matrix.transport }}.${{ matrix.tests-chunk }}
+            echo "COVERAGE_FILE=artifacts/coverage/.coverage.${{ inputs.distro-slug }}.${{ inputs.nox-session }}.${{ matrix.transport }}.${{ matrix.tests-chunk }}" >> GITHUB_ENV
           fi
 
       - name: Destroy VM
@@ -401,7 +285,7 @@ jobs:
         if: always() && inputs.skip-code-coverage == false && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled'
         uses: actions/upload-artifact@v3
         with:
-          name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }}
+          name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
           path: |
             artifacts/coverage/
 
@@ -417,7 +301,7 @@ jobs:
         if: always() && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled'
         uses: actions/upload-artifact@v3
         with:
-          name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }}
+          name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}
           path: |
             artifacts/xml-unittests-output/
 
@@ -425,53 +309,42 @@ jobs:
         if: always() && steps.download-artifacts-from-vm.outcome == 'success' && job.status != 'cancelled'
         uses: actions/upload-artifact@v3
         with:
-          name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }}
+          name: testrun-log-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ matrix.transport }}
           path: |
             artifacts/logs
 
+      - name: Publish Test Report
+        uses: mikepenz/action-junit-report@v3
+        # always run even if the previous steps fails
+        if: always() && inputs.skip-junit-reports == false
+        with:
+          check_name: Test Results(${{ inputs.distro-slug }}, transport=${{ matrix.transport }}, tests-chunk=${{ matrix.tests-chunk }})
+          report_paths: 'artifacts/xml-unittests-output/*.xml'
+          annotate_only: true
+
 
   report:
-    name: Reports for ${{ inputs.distro-slug }}(${{ matrix.transport }})
-    if: always() && (inputs.skip-code-coverage == false || inputs.skip-junit-reports == false) && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
+    name: Test Reports
+    if: always() && inputs.skip-code-coverage == false && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
     runs-on:
       - self-hosted
       - linux
       - x86_64
     needs:
-      - generate-matrix
       - test
-    strategy:
-      fail-fast: false
-      matrix:
-        include: ${{ fromJSON(needs.generate-matrix.outputs.transport-matrix-include) }}
 
     steps:
       - name: Checkout Source Code
-        uses: actions/checkout@v3
-
-      - name: Define Nox Session
-        run: |
-          if [ "${{ matrix.transport }}" != "tcp" ]; then
-            echo NOX_SESSION=${{ inputs.nox-session }} >> "$GITHUB_ENV"
-          else
-            echo NOX_SESSION=${{ inputs.nox-session }}-tcp >> "$GITHUB_ENV"
-          fi
+        uses: actions/checkout@v4
 
       - name: Download Code Coverage Test Run Artifacts
         uses: actions/download-artifact@v3
         if: ${{ inputs.skip-code-coverage == false }}
         id: download-coverage-artifacts
         with:
-          name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }}
+          name: testrun-coverage-artifacts-${{ inputs.distro-slug }}-${{ inputs.nox-session }}
           path: artifacts/coverage/
 
-      - name: Download JUnit XML Test Run Artifacts
-        uses: actions/download-artifact@v3
-        id: download-junit-artifacts
-        with:
-          name: testrun-junit-artifacts-${{ inputs.distro-slug }}-${{ env.NOX_SESSION }}
-          path: artifacts/xml-unittests-output/
-
       - name: Show Downloaded Test Run Artifacts
         run: |
           tree -a artifacts
@@ -510,12 +383,3 @@ jobs:
         continue-on-error: true
         run: |
           nox --force-color -e report-coverage
-
-      - name: Publish Test Report
-        uses: mikepenz/action-junit-report@v3
-        # always run even if the previous steps fails
-        if: always() && inputs.skip-junit-reports == false && steps.download-junit-artifacts.outcome == 'success'
-        with:
-          check_name: Test Results(${{ inputs.distro-slug }})
-          report_paths: 'artifacts/xml-unittests-output/*.xml'
-          annotate_only: true

.github/workflows/test-package-downloads-action-linux.yml

@@ -39,6 +39,11 @@ on:
         required: true
         type: string
         description: The nox version to install
+      python-version:
+        required: false
+        type: string
+        description: The python version to run tests with
+        default: "3.10"
       package-name:
         required: false
         type: string
@@ -53,11 +58,10 @@ on:
         required: false
         type: string
         description: The nox session to run
-        default: test-pkgs-onedir
-
+        default: ci-test-onedir
 
 env:
-  COLUMNS: 160
+  COLUMNS: 190
   AWS_MAX_ATTEMPTS: "10"
   AWS_RETRY_MODE: "adaptive"
   PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
@@ -65,110 +69,24 @@ env:
 
 jobs:
 
-  dependencies:
-    name: Setup Test Dependencies
-    runs-on:
-      - self-hosted
-      - linux
-      - bastion
-    timeout-minutes: 90
-    steps:
-      - name: Checkout Source Code
-        uses: actions/checkout@v3
-
-      - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
-        id: nox-dependencies-cache
-        uses: actions/cache@v3
-        with:
-          path: nox.${{ inputs.distro-slug }}.tar.*
-          key: ${{ inputs.cache-prefix }}|test-pkg-download-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }}
-
-      - name: Download Onedir Tarball as an Artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
-          path: artifacts/
-
-      - name: Decompress Onedir Tarball
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        shell: bash
-        run: |
-          python3 -c "import os; os.makedirs('artifacts', exist_ok=True)"
-          cd artifacts
-          tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
-
-      - name: Setup Python Tools Scripts
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        uses: ./.github/actions/setup-python-tools-scripts
-
-      - name: Get Salt Project GitHub Actions Bot Environment
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30")
-          SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment)
-          echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV"
-
-      - name: Start VM
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        id: spin-up-vm
-        run: |
-          tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ inputs.distro-slug }}
-
-      - name: List Free Space
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm ssh ${{ inputs.distro-slug }} -- df -h || true
-
-      - name: Upload Checkout To VM
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm rsync ${{ inputs.distro-slug }}
-
-      - name: Install Dependencies
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm install-dependencies --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }}
-
-      - name: Cleanup .nox Directory
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm pre-archive-cleanup ${{ inputs.distro-slug }}
-
-      - name: Compress .nox Directory
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm compress-dependencies ${{ inputs.distro-slug }}
-
-      - name: Download Compressed .nox Directory
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm download-dependencies ${{ inputs.distro-slug }}
-
-      - name: Destroy VM
-        if: always() && steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }}
-
-      - name: Upload Nox Requirements Tarball
-        uses: actions/upload-artifact@v3
-        with:
-          name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-download-${{ inputs.arch }}
-          path: nox.${{ inputs.distro-slug }}.tar.*
-
   test:
-    name: Test
+    name: Test Pkg Download
     runs-on:
       - self-hosted
       - linux
       - bastion
     environment: ${{ inputs.environment }}
     timeout-minutes: 120  # 2 Hours - More than this and something is wrong
-    needs:
-      - dependencies
 
     steps:
+
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
+
       - name: Checkout Source Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download Onedir Tarball as an Artifact
         uses: actions/download-artifact@v3
@@ -187,7 +105,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: nox.${{ inputs.distro-slug }}.tar.*
-          key: ${{ inputs.cache-prefix }}|test-pkg-download-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }}
+          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
+              hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py')
+            }}
           # If we get a cache miss here it means the dependencies step failed to save the cache
           fail-on-cache-miss: true
 
@@ -233,7 +153,7 @@ jobs:
           tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \
           -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \
           -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \
-            --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} -- download-pkgs
+            --nox-session=${{ inputs.nox-session }}-pkgs ${{ inputs.distro-slug }} -- download-pkgs
 
       - name: Run Package Download Tests
         env:
@@ -251,7 +171,7 @@ jobs:
           tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
           -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \
           -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING  -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \
-            --nox-session=${{ inputs.nox-session }} --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs
+            --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs
 
       - name: Combine Coverage Reports
         if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled'
@@ -293,7 +213,7 @@ jobs:
             !artifacts/salt-*.tar.*
 
   report:
-    name: Reports for ${{ inputs.distro-slug }}(${{ inputs.arch }})
+    name: Test Pkg Download Reports
     runs-on:
       - self-hosted
       - linux
@@ -305,7 +225,7 @@ jobs:
 
     steps:
       - name: Checkout Source Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download Test Run Artifacts
         id: download-test-run-artifacts

.github/workflows/test-package-downloads-action-macos.yml

@@ -43,7 +43,7 @@ on:
         required: false
         type: string
         description: The python version to run tests with
-        default: "3.10"
+        default: "3.11"
       package-name:
         required: false
         type: string
@@ -58,103 +58,30 @@ on:
         required: false
         type: string
         description: The nox session to run
-        default: test-pkgs-onedir
-
+        default: ci-test-onedir
 
 env:
-  COLUMNS: 160
-  AWS_MAX_ATTEMPTS: "10"
-  AWS_RETRY_MODE: "adaptive"
+  COLUMNS: 190
   PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
   PIP_EXTRA_INDEX_URL: https://pypi.org/simple
 
 jobs:
 
-  dependencies:
-    name: Setup Test Dependencies
-    runs-on: ${{ inputs.distro-slug }}
-    timeout-minutes: 90
-    steps:
-      - name: Checkout Source Code
-        uses: actions/checkout@v3
-
-      - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
-        id: nox-dependencies-cache
-        uses: actions/cache@v3
-        with:
-          path: nox.${{ inputs.distro-slug }}.tar.*
-          key: ${{ inputs.cache-prefix }}|test-pkg-download-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }}
-
-      - name: Download Onedir Tarball as an Artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
-          path: artifacts/
-
-      - name: Decompress Onedir Tarball
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        shell: bash
-        run: |
-          python3 -c "import os; os.makedirs('artifacts', exist_ok=True)"
-          cd artifacts
-          tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
-
-      - name: Set up Python ${{ inputs.python-version }}
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        uses: actions/setup-python@v4
-        with:
-          python-version: "${{ inputs.python-version }}"
-          update-environment: true
-
-      - name: Install System Dependencies
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          brew install openssl@3
-
-      - name: Install Nox
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          python3 -m pip install 'nox==${{ inputs.nox-version }}'
-
-      - name: Install Dependencies
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        env:
-          PRINT_TEST_SELECTION: "0"
-          PRINT_SYSTEM_INFO: "0"
-        run: |
-          export PYCURL_SSL_LIBRARY=openssl
-          export LDFLAGS="-L/usr/local/opt/openssl@3/lib"
-          export CPPFLAGS="-I/usr/local/opt/openssl@3/include"
-          export PKG_CONFIG_PATH="/usr/local/opt/openssl@3/lib/pkgconfig"
-          nox --force-color --install-only -e ${{ inputs.nox-session }}
-
-      - name: Cleanup .nox Directory
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          nox --force-color -e "pre-archive-cleanup(pkg=False)"
-
-      - name: Compress .nox Directory
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          nox --force-color -e compress-dependencies -- ${{ inputs.distro-slug }}
-
-      - name: Upload Nox Requirements Tarball
-        uses: actions/upload-artifact@v3
-        with:
-          name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-download-${{ inputs.arch }}
-          path: nox.${{ inputs.distro-slug }}.tar.*
-
   test:
-    name: Test
+    name: Test Pkg Download
     runs-on: ${{ inputs.distro-slug }}
     environment: ${{ inputs.environment }}
     timeout-minutes: 120  # 2 Hours - More than this and something is wrong
-    needs:
-      - dependencies
 
     steps:
+
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t"
+
       - name: Checkout Source Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download Onedir Tarball as an Artifact
         uses: actions/download-artifact@v3
@@ -187,7 +114,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: nox.${{ inputs.distro-slug }}.tar.*
-          key: ${{ inputs.cache-prefix }}|test-pkg-download-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }}
+          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
+              hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py')
+            }}
           # If we get a cache miss here it means the dependencies step failed to save the cache
           fail-on-cache-miss: true
 
@@ -208,7 +137,7 @@ jobs:
           LATEST_SALT_RELEASE: "${{ inputs.latest-release }}"
           DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }}
         run: |
-          sudo -E nox --force-color -e ${{ inputs.nox-session }} -- download-pkgs
+          sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs
 
       - name: Run Package Download Tests
         env:
@@ -231,7 +160,7 @@ jobs:
           SALT_REPO_DOMAIN_STAGING: ${{ vars.SALT_REPO_DOMAIN_STAGING || 'staging.repo.saltproject.io' }}
           DOWNLOAD_TEST_PACKAGE_TYPE: ${{ inputs.pkg-type }}
         run: |
-          sudo -E nox --force-color -e ${{ inputs.nox-session }} -- download-pkgs
+          sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- download-pkgs
 
       - name: Fix file ownership
         run: |
@@ -267,7 +196,7 @@ jobs:
             !artifacts/salt-*.tar.*
 
   report:
-    name: Reports for ${{ inputs.distro-slug }}(${{ inputs.arch }})
+    name: Test Pkg Download Reports
     runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }}
     environment: ${{ inputs.environment }}
     if: always() && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
@@ -276,7 +205,7 @@ jobs:
 
     steps:
       - name: Checkout Source Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download Test Run Artifacts
         id: download-test-run-artifacts

.github/workflows/test-package-downloads-action-windows.yml

@@ -39,6 +39,11 @@ on:
         required: true
         type: string
         description: The nox version to install
+      python-version:
+        required: false
+        type: string
+        description: The python version to run tests with
+        default: "3.10"
       package-name:
         required: false
         type: string
@@ -48,7 +53,7 @@ on:
         required: false
         type: string
         description: The nox session to run
-        default: test-pkgs-onedir
+        default: ci-test-onedir
       skip-code-coverage:
         required: false
         type: boolean
@@ -60,9 +65,8 @@ on:
         description: Skip Publishing JUnit Reports
         default: false
 
-
 env:
-  COLUMNS: 160
+  COLUMNS: 190
   AWS_MAX_ATTEMPTS: "10"
   AWS_RETRY_MODE: "adaptive"
   PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
@@ -70,110 +74,18 @@ env:
 
 jobs:
 
-  dependencies:
-    name: Setup Test Dependencies
-    runs-on:
-      - self-hosted
-      - linux
-      - bastion
-    timeout-minutes: 90
-    steps:
-      - name: Checkout Source Code
-        uses: actions/checkout@v3
-
-      - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
-        id: nox-dependencies-cache
-        uses: actions/cache@v3
-        with:
-          path: nox.${{ inputs.distro-slug }}.tar.*
-          key: ${{ inputs.cache-prefix }}|test-pkg-download-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }}
-
-      - name: Download Onedir Tarball as an Artifact
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
-          path: artifacts/
-
-      - name: Decompress Onedir Tarball
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        shell: bash
-        run: |
-          python3 -c "import os; os.makedirs('artifacts', exist_ok=True)"
-          cd artifacts
-          tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
-
-      - name: Setup Python Tools Scripts
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        uses: ./.github/actions/setup-python-tools-scripts
-
-      - name: Get Salt Project GitHub Actions Bot Environment
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30")
-          SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment)
-          echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV"
-
-      - name: Start VM
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        id: spin-up-vm
-        run: |
-          tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ inputs.distro-slug }}
-
-      - name: List Free Space
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm ssh ${{ inputs.distro-slug }} -- df -h || true
-
-      - name: Upload Checkout To VM
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm rsync ${{ inputs.distro-slug }}
-
-      - name: Install Dependencies
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm install-dependencies --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }}
-
-      - name: Cleanup .nox Directory
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm pre-archive-cleanup ${{ inputs.distro-slug }}
-
-      - name: Compress .nox Directory
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm compress-dependencies ${{ inputs.distro-slug }}
-
-      - name: Download Compressed .nox Directory
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm download-dependencies ${{ inputs.distro-slug }}
-
-      - name: Destroy VM
-        if: always() && steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }}
-
-      - name: Upload Nox Requirements Tarball
-        uses: actions/upload-artifact@v3
-        with:
-          name: nox-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}-${{ inputs.nox-session }}-download-${{ inputs.arch }}
-          path: nox.${{ inputs.distro-slug }}.tar.*
-
   test:
-    name: Test
+    name: Test Pkg Download
     runs-on:
       - self-hosted
       - linux
       - bastion
     environment: ${{ inputs.environment }}
     timeout-minutes: 120  # 2 Hours - More than this and something is wrong
-    needs:
-      - dependencies
 
     steps:
       - name: Checkout Source Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download Onedir Tarball as an Artifact
         uses: actions/download-artifact@v3
@@ -192,7 +104,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: nox.${{ inputs.distro-slug }}.tar.*
-          key: ${{ inputs.cache-prefix }}|test-pkg-download-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }}
+          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
+              hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py')
+            }}
           # If we get a cache miss here it means the dependencies step failed to save the cache
           fail-on-cache-miss: true
 
@@ -238,7 +152,7 @@ jobs:
           tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \
           -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \
           -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \
-            --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} -- download-pkgs
+            --nox-session=${{ inputs.nox-session }}-pkgs ${{ inputs.distro-slug }} -- download-pkgs
 
       - name: Run Package Download Tests
         env:
@@ -256,7 +170,7 @@ jobs:
           tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
           -E INSTALL_TYPE -E SALT_RELEASE -E SALT_REPO_ARCH -E SALT_REPO_TYPE -E SALT_REPO_USER -E SALT_REPO_PASS \
           -E SALT_REPO_DOMAIN_RELEASE -E SALT_REPO_DOMAIN_STAGING -E LATEST_SALT_RELEASE -E DOWNLOAD_TEST_PACKAGE_TYPE \
-            --nox-session=${{ inputs.nox-session }} --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs
+            --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- download-pkgs
 
       - name: Combine Coverage Reports
         if: always() && inputs.skip-code-coverage == false && steps.spin-up-vm.outcome == 'success' && job.status != 'cancelled'
@@ -298,7 +212,7 @@ jobs:
             !artifacts/salt-*.tar.*
 
   report:
-    name: Reports for ${{ inputs.distro-slug }}(${{ inputs.arch }})
+    name: Test Pkg Download Reports
     runs-on:
       - self-hosted
       - linux
@@ -310,7 +224,7 @@ jobs:
 
     steps:
       - name: Checkout Source Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download Test Run Artifacts
         id: download-test-run-artifacts

.github/workflows/test-packages-action-macos.yml

@@ -49,7 +49,7 @@ on:
         required: false
         type: string
         description: The nox session to run
-        default: test-pkgs-onedir
+        default: ci-test-onedir
       skip-code-coverage:
         required: false
         type: boolean
@@ -61,24 +61,27 @@ on:
         description: Skip Publishing JUnit Reports
         default: false
 
-
 env:
-  COLUMNS: 160
-  AWS_MAX_ATTEMPTS: "10"
-  AWS_RETRY_MODE: "adaptive"
+  COLUMNS: 190
   PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
   PIP_EXTRA_INDEX_URL: https://pypi.org/simple
 
 jobs:
 
   generate-matrix:
-    name: Generate Package Test Matrix
+    name: Test Pkg Matrix
     runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }}
     outputs:
       pkg-matrix-include: ${{ steps.generate-pkg-matrix.outputs.matrix }}
     steps:
+
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(python3 -c 'import random, sys; sys.stdout.write(str(random.randint(1, 15)))'); echo "Sleeping $t seconds"; sleep "$t"
+
       - name: Checkout Source Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
@@ -88,88 +91,12 @@ jobs:
         run: |
           tools ci pkg-matrix ${{ inputs.distro-slug }} ${{ inputs.pkg-type }}  --testing-releases ${{ join(fromJSON(inputs.testing-releases), ' ') }}
 
-  dependencies:
-    name: Setup Test Dependencies
-    needs:
-      - generate-matrix
-    runs-on: ${{ inputs.distro-slug }}
-    timeout-minutes: 90
-    steps:
-      - name: Checkout Source Code
-        uses: actions/checkout@v3
-
-      - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
-        id: nox-dependencies-cache
-        uses: actions/cache@v3
-        with:
-          path: nox.${{ inputs.distro-slug }}.tar.*
-          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }}
-
-      - name: Download Onedir Tarball as an Artifact
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
-          path: artifacts/
-
-      - name: Decompress Onedir Tarball
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        shell: bash
-        run: |
-          python3 -c "import os; os.makedirs('artifacts', exist_ok=True)"
-          cd artifacts
-          tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
-
-      - name: Set up Python ${{ inputs.python-version }}
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        uses: actions/setup-python@v4
-        with:
-          python-version: "${{ inputs.python-version }}"
-
-      - name: Install System Dependencies
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          brew install openssl@3
-
-      - name: Install Nox
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          python3 -m pip install 'nox==${{ inputs.nox-version }}'
-
-      - name: Install Dependencies
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        env:
-          PRINT_TEST_SELECTION: "0"
-          PRINT_SYSTEM_INFO: "0"
-        run: |
-          export PYCURL_SSL_LIBRARY=openssl
-          export LDFLAGS="-L/usr/local/opt/openssl@3/lib"
-          export CPPFLAGS="-I/usr/local/opt/openssl@3/include"
-          export PKG_CONFIG_PATH="/usr/local/opt/openssl@3/lib/pkgconfig"
-          nox --force-color --install-only -e ${{ inputs.nox-session }}
-
-      - name: Cleanup .nox Directory
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          nox --force-color -e "pre-archive-cleanup(pkg=False)"
-
-      - name: Compress .nox Directory
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          nox --force-color -e compress-dependencies -- ${{ inputs.distro-slug }}
-
-      - name: Upload Nox Requirements Tarball
-        uses: actions/upload-artifact@v3
-        with:
-          name: nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ inputs.arch }}
-          path: nox.${{ inputs.distro-slug }}.tar.*
 
   test:
-    name: Test
+    name: Test Pkg
     runs-on: ${{ inputs.distro-slug }}
     timeout-minutes: 120  # 2 Hours - More than this and something is wrong
     needs:
-      - dependencies
       - generate-matrix
     strategy:
       fail-fast: false
@@ -178,7 +105,7 @@ jobs:
 
     steps:
       - name: Checkout Source Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download Packages
         uses: actions/download-artifact@v3
@@ -220,7 +147,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: nox.${{ inputs.distro-slug }}.tar.*
-          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }}
+          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
+              hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py')
+            }}
           # If we get a cache miss here it means the dependencies step failed to save the cache
           fail-on-cache-miss: true
 
@@ -237,7 +166,7 @@ jobs:
           GITHUB_ACTIONS_PIPELINE: "1"
           SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
         run: |
-          sudo -E nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.test-chunk }} \
+          sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- ${{ matrix.test-chunk }} \
           ${{ matrix.version && format('--prev-version {0}', matrix.version) || ''}}
 
       - name: Run Package Tests
@@ -251,7 +180,7 @@ jobs:
           SKIP_INITIAL_GH_ACTIONS_FAILURES: "1"
           COVERAGE_CONTEXT: ${{ inputs.distro-slug }}
         run: |
-          sudo -E nox --force-color -e ${{ inputs.nox-session }} -- ${{ matrix.test-chunk }} \
+          sudo -E nox --force-color -e ${{ inputs.nox-session }}-pkgs -- ${{ matrix.test-chunk }} \
           ${{ matrix.version && format('--prev-version {0}', matrix.version) || ''}}
 
       - name: Fix file ownership
@@ -278,7 +207,7 @@ jobs:
             !artifacts/salt-*.tar.*
 
   report:
-    name: Reports for ${{ inputs.distro-slug }}(${{ matrix.test-chunk }})
+    name: Test Pkg Reports
     runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }}
     if: always() && (inputs.skip-code-coverage == false || inputs.skip-junit-reports == false) && needs.test.result != 'cancelled' && needs.test.result != 'skipped'
     needs:
@@ -291,7 +220,7 @@ jobs:
 
     steps:
       - name: Checkout Source Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download Test Run Artifacts
         id: download-test-run-artifacts

.github/workflows/test-packages-action.yml

@@ -35,6 +35,11 @@ on:
         required: true
         type: string
         description: The nox version to install
+      python-version:
+        required: false
+        type: string
+        description: The python version to run tests with
+        default: "3.10"
       package-name:
         required: false
         type: string
@@ -44,7 +49,7 @@ on:
         required: false
         type: string
         description: The nox session to run
-        default: test-pkgs-onedir
+        default: ci-test-onedir
       skip-code-coverage:
         required: false
         type: boolean
@@ -56,9 +61,8 @@ on:
         description: Skip Publishing JUnit Reports
         default: false
 
-
 env:
-  COLUMNS: 160
+  COLUMNS: 190
   AWS_MAX_ATTEMPTS: "10"
   AWS_RETRY_MODE: "adaptive"
   PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
@@ -67,7 +71,7 @@ env:
 jobs:
 
   generate-matrix:
-    name: Generate Package Test Matrix
+    name: Test ${{ inputs.pkg-type }} Pkg Matrix
     runs-on:
       - self-hosted
       - linux
@@ -75,8 +79,14 @@ jobs:
     outputs:
       pkg-matrix-include: ${{ steps.generate-pkg-matrix.outputs.matrix }}
     steps:
+
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
+
       - name: Checkout Source Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Setup Python Tools Scripts
         uses: ./.github/actions/setup-python-tools-scripts
@@ -86,110 +96,9 @@ jobs:
         run: |
           tools ci pkg-matrix ${{ inputs.distro-slug }} ${{ inputs.pkg-type }} --testing-releases ${{ join(fromJSON(inputs.testing-releases), ' ') }}
 
-  dependencies:
-    name: Setup Test Dependencies
-    needs:
-      - generate-matrix
-    runs-on:
-      - self-hosted
-      - linux
-      - bastion
-    timeout-minutes: 90
-    steps:
-      - name: Checkout Source Code
-        uses: actions/checkout@v3
-
-      - name: Cache nox.${{ inputs.distro-slug }}.tar.* for session ${{ inputs.nox-session }}
-        id: nox-dependencies-cache
-        uses: actions/cache@v3
-        with:
-          path: nox.${{ inputs.distro-slug }}.tar.*
-          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }}
-
-      - name: Download Onedir Tarball as an Artifact
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        uses: actions/download-artifact@v3
-        with:
-          name: ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
-          path: artifacts/
-
-      - name: Decompress Onedir Tarball
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        shell: bash
-        run: |
-          python3 -c "import os; os.makedirs('artifacts', exist_ok=True)"
-          cd artifacts
-          tar xvf ${{ inputs.package-name }}-${{ inputs.salt-version }}-onedir-${{ inputs.platform }}-${{ inputs.arch }}.tar.xz
-
-      - name: Setup Python Tools Scripts
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        uses: ./.github/actions/setup-python-tools-scripts
-
-      - name: Get Salt Project GitHub Actions Bot Environment
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          TOKEN=$(curl -sS -f -X PUT "http://169.254.169.254/latest/api/token" -H "X-aws-ec2-metadata-token-ttl-seconds: 30")
-          SPB_ENVIRONMENT=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/tags/instance/spb:environment)
-          echo "SPB_ENVIRONMENT=$SPB_ENVIRONMENT" >> "$GITHUB_ENV"
-
-      - name: Start VM
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        id: spin-up-vm
-        run: |
-          tools --timestamps vm create --environment "${SPB_ENVIRONMENT}" --retries=2 ${{ inputs.distro-slug }}
-
-      - name: List Free Space
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm ssh ${{ inputs.distro-slug }} -- df -h || true
-
-      - name: Upload Checkout To VM
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm rsync ${{ inputs.distro-slug }}
-
-      - name: Install Dependencies
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm install-dependencies --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }}
-
-      - name: Cleanup .nox Directory
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm pre-archive-cleanup ${{ inputs.distro-slug }}
-
-      - name: Compress .nox Directory
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm compress-dependencies ${{ inputs.distro-slug }}
-
-      - name: Download Compressed .nox Directory
-        if: steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm download-dependencies ${{ inputs.distro-slug }}
-
-      - name: Destroy VM
-        if: always() && steps.nox-dependencies-cache.outputs.cache-hit != 'true'
-        run: |
-          tools --timestamps vm destroy --no-wait ${{ inputs.distro-slug }}
-
-      - name: Define Nox Upload Artifact Name
-        id: nox-artifact-name
-        run: |
-          if [ "${{ contains(inputs.distro-slug, 'windows') }}" != "true" ]; then
-            echo "name=nox-${{ inputs.distro-slug }}-${{ inputs.nox-session }}-${{ inputs.arch }}" >> "${GITHUB_OUTPUT}"
-          else
-            echo "name=nox-${{ inputs.distro-slug }}-${{ inputs.pkg-type }}-${{ inputs.nox-session }}-${{ inputs.arch }}" >> "${GITHUB_OUTPUT}"
-          fi
-
-      - name: Upload Nox Requirements Tarball
-        uses: actions/upload-artifact@v3
-        with:
-          name: ${{ steps.nox-artifact-name.outputs.name }}
-          path: nox.${{ inputs.distro-slug }}.tar.*
 
   test:
-    name: Test
+    name: Test Pkg
     runs-on:
       - self-hosted
       - linux
@@ -197,7 +106,6 @@ jobs:
     timeout-minutes: 120  # 2 Hours - More than this and something is wrong
     needs:
       - generate-matrix
-      - dependencies
     strategy:
       fail-fast: false
       matrix:
@@ -205,7 +113,7 @@ jobs:
 
     steps:
       - name: Checkout Source Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download Packages
         uses: actions/download-artifact@v3
@@ -234,7 +142,9 @@ jobs:
         uses: actions/cache@v3
         with:
           path: nox.${{ inputs.distro-slug }}.tar.*
-          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py') }}
+          key: ${{ inputs.cache-prefix }}|testrun-deps|${{ inputs.arch }}|${{ inputs.distro-slug }}|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{
+              hashFiles('requirements/**/*.txt', 'cicd/golden-images.json', 'noxfile.py')
+            }}
           # If we get a cache miss here it means the dependencies step failed to save the cache
           fail-on-cache-miss: true
 
@@ -264,16 +174,22 @@ jobs:
         run: |
           tools --timestamps vm decompress-dependencies ${{ inputs.distro-slug }}
 
+      - name: Downgrade importlib-metadata
+        if: ${{ contains(fromJSON('["amazonlinux-2", "centos-7", "debian-10"]'), inputs.distro-slug) && contains(fromJSON('["upgrade-classic", "downgrade-classic"]'), matrix.test-chunk) }}
+        run: |
+          # This step can go away once we stop testing classic packages upgrade/downgrades to/from 3005.x
+          tools --timestamps vm ssh ${{ inputs.distro-slug }} -- "sudo python3 -m pip install -U 'importlib-metadata<=4.13.0' 'virtualenv<=20.21.1'"
+
       - name: Show System Info & Test Plan
         run: |
           tools --timestamps --timeout-secs=1800 vm testplan --skip-requirements-install \
-            --nox-session=${{ inputs.nox-session }} ${{ inputs.distro-slug }} -- ${{ matrix.test-chunk }} \
+            --nox-session=${{ inputs.nox-session }}-pkgs ${{ inputs.distro-slug }} -- ${{ matrix.test-chunk }} \
             ${{ matrix.version && format('--prev-version {0}', matrix.version) || ''}}
 
       - name: Run Package Tests
         run: |
           tools --timestamps --no-output-timeout-secs=1800 --timeout-secs=14400 vm test --skip-requirements-install \
-          --nox-session=${{ inputs.nox-session }} --rerun-failures ${{ inputs.distro-slug }} -- ${{ matrix.test-chunk }} \
+          --nox-session=${{ inputs.nox-session }}-pkgs --rerun-failures ${{ inputs.distro-slug }} -- ${{ matrix.test-chunk }} \
           ${{ matrix.version && format('--prev-version {0}', matrix.version) || ''}}
 
       - name: Download Test Run Artifacts
@@ -302,7 +218,7 @@ jobs:
             !artifacts/salt-*.tar.*
 
   report:
-    name: Reports for ${{ inputs.distro-slug }}(${{ matrix.test-chunk }})
+    name: Test Pkg Reports
     runs-on:
       - self-hosted
       - linux
@@ -318,7 +234,7 @@ jobs:
 
     steps:
       - name: Checkout Source Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Download Test Run Artifacts
         id: download-test-run-artifacts

.github/workflows/triage.yml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ${{ github.event.repository.private && fromJSON('["self-hosted", "linux", "x86_64"]') || 'ubuntu-latest' }}
     steps:
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Set up Python
         uses: actions/setup-python@v4

.pre-commit-config.yaml

@@ -103,7 +103,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.8
           - --platform=linux
           - --include=requirements/base.txt
@@ -119,7 +118,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.9
           - --platform=linux
           - --include=requirements/base.txt
@@ -135,7 +133,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.10
           - --platform=linux
           - --include=requirements/base.txt
@@ -150,6 +147,7 @@ repos:
         pass_filenames: false
         args:
           - -v
+          - --build-isolation
           - --py-version=3.11
           - --platform=linux
           - --include=requirements/base.txt
@@ -165,7 +163,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.8
           - --platform=freebsd
           - --include=requirements/base.txt
@@ -181,7 +178,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.9
           - --platform=freebsd
           - --include=requirements/base.txt
@@ -197,7 +193,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.10
           - --platform=freebsd
           - --include=requirements/base.txt
@@ -212,10 +207,12 @@ repos:
         pass_filenames: false
         args:
           - -v
+          - --build-isolation
           - --py-version=3.11
           - --platform=freebsd
           - --include=requirements/base.txt
           - --include=requirements/zeromq.txt
+          - --no-emit-index-url
           - requirements/static/pkg/freebsd.in
 
       - id: pip-tools-compile
@@ -226,7 +223,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.9
           - --platform=darwin
           - --include=requirements/darwin.txt
@@ -241,7 +237,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.10
           - --platform=darwin
           - --include=requirements/darwin.txt
@@ -255,6 +250,7 @@ repos:
         pass_filenames: false
         args:
           - -v
+          - --build-isolation
           - --py-version=3.11
           - --platform=darwin
           - --include=requirements/darwin.txt
@@ -269,7 +265,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.8
           - --platform=windows
           - --include=requirements/windows.txt
@@ -284,7 +279,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.9
           - --platform=windows
           - --include=requirements/windows.txt
@@ -299,7 +293,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.10
           - --platform=windows
           - --include=requirements/windows.txt
@@ -313,9 +306,11 @@ repos:
         pass_filenames: false
         args:
           - -v
+          - --build-isolation
           - --py-version=3.11
           - --platform=windows
           - --include=requirements/windows.txt
+          - --no-emit-index-url
           - requirements/static/pkg/windows.in
 
   # <---- Packaging Requirements -------------------------------------------------------------------------------------
@@ -324,12 +319,11 @@ repos:
       - id: pip-tools-compile
         alias: compile-ci-linux-3.8-zmq-requirements
         name: Linux CI Py3.8 ZeroMQ Requirements
-        files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in|py3\.8/linux\.txt)))$
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in)|py3\.8/linux\.txt))$
         pass_filenames: false
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.8
           - --platform=linux
           - --include=requirements/base.txt
@@ -343,12 +337,11 @@ repos:
       - id: pip-tools-compile
         alias: compile-ci-linux-3.9-zmq-requirements
         name: Linux CI Py3.9 ZeroMQ Requirements
-        files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in|py3\.9/linux\.txt)))$
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in)|py3\.9/linux\.txt))$
         pass_filenames: false
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.9
           - --platform=linux
           - --include=requirements/base.txt
@@ -362,12 +355,11 @@ repos:
       - id: pip-tools-compile
         alias: compile-ci-linux-3.10-zmq-requirements
         name: Linux CI Py3.10 ZeroMQ Requirements
-        files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in|py3\.10/linux\.txt)))$
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in)|py3\.10/linux\.txt))$
         pass_filenames: false
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.10
           - --platform=linux
           - --include=requirements/base.txt
@@ -381,12 +373,11 @@ repos:
       - id: pip-tools-compile
         alias: compile-ci-linux-3.11-zmq-requirements
         name: Linux CI Py3.11 ZeroMQ Requirements
-        files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in|py3\.11/linux\.txt)))$
+        files: ^requirements/((base|zeromq|pytest)\.txt|static/((ci|pkg)/(linux\.in|common\.in)|py3\.11/linux\.txt))$
         pass_filenames: false
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.11
           - --platform=linux
           - --include=requirements/base.txt
@@ -405,7 +396,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.8
           - --platform=linux
           - --out-prefix=linux
@@ -420,7 +410,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.9
           - --platform=linux
           - --out-prefix=linux
@@ -430,13 +419,11 @@ repos:
       - id: pip-tools-compile
         alias: compile-ci-linux-crypto-3.10-requirements
         name: Linux CI Py3.10 Crypto Requirements
-        files: ^requirements/(crypto\.txt|static/ci/crypto\.in)$
         files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.10/linux-crypto\.txt))$
         pass_filenames: false
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.10
           - --platform=linux
           - --out-prefix=linux
@@ -446,13 +433,11 @@ repos:
       - id: pip-tools-compile
         alias: compile-ci-linux-crypto-3.11-requirements
         name: Linux CI Py3.11 Crypto Requirements
-        files: ^requirements/(crypto\.txt|static/ci/crypto\.in)$
         files: ^requirements/(crypto\.txt|static/ci/(crypto\.in|py3\.11/linux-crypto\.txt))$
         pass_filenames: false
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.11
           - --platform=linux
           - --out-prefix=linux
@@ -467,7 +452,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.8
           - --platform=freebsd
           - --include=requirements/base.txt
@@ -486,7 +470,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.9
           - --platform=freebsd
           - --include=requirements/base.txt
@@ -505,7 +488,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.10
           - --platform=freebsd
           - --include=requirements/base.txt
@@ -524,7 +506,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.11
           - --platform=freebsd
           - --include=requirements/base.txt
@@ -543,7 +524,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.8
           - --platform=freebsd
           - --out-prefix=freebsd
@@ -558,7 +538,7 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
+          - --build-isolation
           - --py-version=3.9
           - --platform=freebsd
           - --out-prefix=freebsd
@@ -574,7 +554,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.10
           - --platform=freebsd
           - --out-prefix=freebsd
@@ -590,10 +569,10 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.11
           - --platform=freebsd
           - --out-prefix=freebsd
+          - --no-emit-index-url
           - requirements/static/ci/crypto.in
 
       - id: pip-tools-compile
@@ -604,7 +583,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.9
           - --platform=darwin
           - --include=requirements/darwin.txt
@@ -622,7 +600,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.10
           - --platform=darwin
           - --include=requirements/darwin.txt
@@ -640,13 +617,13 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.11
           - --platform=darwin
           - --include=requirements/darwin.txt
           - --include=requirements/pytest.txt
           - --include=requirements/static/pkg/darwin.in
           - --include=requirements/static/ci/common.in
+          - --no-emit-index-url
           - requirements/static/ci/darwin.in
 
       - id: pip-tools-compile
@@ -657,7 +634,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.9
           - --platform=darwin
           - --out-prefix=darwin
@@ -672,7 +648,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.10
           - --platform=darwin
           - --out-prefix=darwin
@@ -687,7 +662,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.11
           - --platform=darwin
           - --out-prefix=darwin
@@ -702,7 +676,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.8
           - --platform=windows
           - --include=requirements/windows.txt
@@ -720,7 +693,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.9
           - --platform=windows
           - --include=requirements/windows.txt
@@ -738,7 +710,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.10
           - --platform=windows
           - --include=requirements/windows.txt
@@ -756,7 +727,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.11
           - --platform=windows
           - --include=requirements/windows.txt
@@ -774,7 +744,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.8
           - --platform=windows
           - --out-prefix=windows
@@ -789,7 +758,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.9
           - --platform=windows
           - --out-prefix=windows
@@ -804,7 +772,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.10
           - --platform=windows
           - --out-prefix=windows
@@ -819,10 +786,10 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.11
           - --platform=windows
           - --out-prefix=windows
+          - --no-emit-index-url
           - requirements/static/ci/crypto.in
 
   # <---- CI Requirements --------------------------------------------------------------------------------------------
@@ -837,7 +804,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.8
           - --no-emit-index-url
           - requirements/static/ci/cloud.in
@@ -850,7 +816,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.9
           - --no-emit-index-url
           - requirements/static/ci/cloud.in
@@ -863,7 +828,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.10
           - --no-emit-index-url
           - requirements/static/ci/cloud.in
@@ -876,7 +840,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.11
           - --no-emit-index-url
           - requirements/static/ci/cloud.in
@@ -891,7 +854,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.8
           - --platform=linux
           - --no-emit-index-url
@@ -905,7 +867,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.9
           - --platform=linux
           - --no-emit-index-url
@@ -919,7 +880,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.10
           - --platform=linux
           - --no-emit-index-url
@@ -933,8 +893,8 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.11
+          - --no-emit-index-url
           - --platform=linux
           - requirements/static/ci/docs.in
   # <---- Doc CI Requirements ----------------------------------------------------------------------------------------
@@ -948,7 +908,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.8
           - --platform=linux
           - --no-emit-index-url
@@ -962,7 +921,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.9
           - --platform=linux
           - --no-emit-index-url
@@ -976,7 +934,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.10
           - --platform=linux
           - --no-emit-index-url
@@ -990,7 +947,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.11
           - --platform=linux
           - --no-emit-index-url
@@ -1007,7 +963,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.8
           - --platform=linux
           - --no-emit-index-url
@@ -1021,7 +976,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.9
           - --platform=linux
           - --no-emit-index-url
@@ -1035,7 +989,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.10
           - --platform=linux
           - --no-emit-index-url
@@ -1049,7 +1002,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.11
           - --platform=linux
           - --no-emit-index-url
@@ -1065,7 +1017,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.8
           - --no-emit-index-url
           - requirements/static/ci/invoke.in
@@ -1078,7 +1029,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.9
           - --no-emit-index-url
           - requirements/static/ci/invoke.in
@@ -1091,68 +1041,11 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.10
           - --no-emit-index-url
           - requirements/static/ci/invoke.in
   # <---- Invoke -----------------------------------------------------------------------------------------------------
 
-  # <---- PKG ci requirements-----------------------------------------------------------------------------------------
-      - id: pip-tools-compile
-        alias: compile-ci-pkg-3.10-requirements
-        name: PKG tests CI Py3.10 Requirements
-        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/((pkgtests|common)\.in|py3\.10/pkgtests\.in)))$
-        pass_filenames: false
-        args:
-          - -v
-          - --py-version=3.10
-          - --platform=linux
-          - --include=requirements/base.txt
-          - --include=requirements/zeromq.txt
-          - requirements/static/ci/pkgtests.in
-
-      - id: pip-tools-compile
-        alias: compile-ci-windows-pkg-3.10-requirements
-        name: PKG tests Windows CI Py3.10 Requirements
-        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/((pkgtests-windows|common)\.in|py3\.10/pkgtests-windows\.in)))$
-        pass_filenames: false
-        args:
-          - -v
-          - --py-version=3.10
-          - --platform=windows
-          - --include=requirements/base.txt
-          - --include=requirements/zeromq.txt
-          - requirements/static/ci/pkgtests-windows.in
-
-      - id: pip-tools-compile
-        alias: compile-ci-pkg-3.11-requirements
-        name: PKG tests CI Py3.11 Requirements
-        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/((pkgtests|common)\.in|py3\.11/pkgtests\.in)))$
-        pass_filenames: false
-        args:
-          - -v
-          - --py-version=3.11
-          - --platform=linux
-          - --include=requirements/base.txt
-          - --include=requirements/zeromq.txt
-          - requirements/static/ci/pkgtests.in
-
-      - id: pip-tools-compile
-        alias: compile-ci-windows-pkg-3.11-requirements
-        name: PKG tests Windows CI Py3.11 Requirements
-        files: ^requirements/((base|zeromq|pytest)\.txt|static/(pkg/linux\.in|ci/((pkgtests-windows|common)\.in|py3\.11/pkgtests-windows\.in)))$
-        pass_filenames: false
-        args:
-          - -v
-          - --py-version=3.11
-          - --platform=windows
-          - --include=requirements/base.txt
-          - --include=requirements/zeromq.txt
-          - requirements/static/ci/pkgtests-windows.in
-
-  # <---- PKG ci requirements-----------------------------------------------------------------------------------------
-
-
   # ----- Tools ---------------------------------------------------------------------------------------------------->
       - id: pip-tools-compile
         alias: compile-ci-tools-3.9-requirements
@@ -1162,7 +1055,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.9
           - --no-emit-index-url
           - requirements/static/ci/tools.in
@@ -1175,7 +1067,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.10
           - --no-emit-index-url
           - requirements/static/ci/tools.in
@@ -1188,7 +1079,6 @@ repos:
         args:
           - -v
           - --build-isolation
-#          - --resolver=backtracking
           - --py-version=3.11
           - --no-emit-index-url
           - requirements/static/ci/tools.in

changelog/38098.fixed.md

@@ -0,0 +1 @@
+Improved error message when state arguments are accidentally passed as a string

cicd/amis.yml

@@ -1 +1 @@
-centosstream-9-x86_64: ami-0dfa940714a95b497
+centosstream-9-x86_64: ami-091986d83f4c0bdd7

cicd/shared-gh-workflows-context.yml

@@ -1,5 +1,5 @@
 nox_version: "2022.8.7"
 python_version: "3.10.13"
-relenv_version: "0.13.10"
+relenv_version: "0.13.11"
 release-branches:
   - "3006.x"

noxfile.py

@@ -13,7 +13,6 @@ import os
 import pathlib
 import shutil
 import sqlite3
-import subprocess
 import sys
 import tarfile
 import tempfile
@@ -190,21 +189,12 @@ def _get_pydir(session):
     return "py{}.{}".format(*version_info)
 
 
-def _get_pip_requirements_file(session, transport, crypto=None, requirements_type="ci"):
+def _get_pip_requirements_file(session, crypto=None, requirements_type="ci"):
     assert requirements_type in ("ci", "pkg")
     pydir = _get_pydir(session)
 
     if IS_WINDOWS:
         if crypto is None:
-            _requirements_file = os.path.join(
-                "requirements",
-                "static",
-                requirements_type,
-                pydir,
-                f"{transport}-windows.txt",
-            )
-            if os.path.exists(_requirements_file):
-                return _requirements_file
             _requirements_file = os.path.join(
                 "requirements", "static", requirements_type, pydir, "windows.txt"
             )
@@ -218,15 +208,6 @@ def _get_pip_requirements_file(session, transport, crypto=None, requirements_typ
         session.error(f"Could not find a windows requirements file for {pydir}")
     elif IS_DARWIN:
         if crypto is None:
-            _requirements_file = os.path.join(
-                "requirements",
-                "static",
-                requirements_type,
-                pydir,
-                f"{transport}-darwin.txt",
-            )
-            if os.path.exists(_requirements_file):
-                return _requirements_file
             _requirements_file = os.path.join(
                 "requirements", "static", requirements_type, pydir, "darwin.txt"
             )
@@ -240,15 +221,6 @@ def _get_pip_requirements_file(session, transport, crypto=None, requirements_typ
         session.error(f"Could not find a darwin requirements file for {pydir}")
     elif IS_FREEBSD:
         if crypto is None:
-            _requirements_file = os.path.join(
-                "requirements",
-                "static",
-                requirements_type,
-                pydir,
-                f"{transport}-freebsd.txt",
-            )
-            if os.path.exists(_requirements_file):
-                return _requirements_file
             _requirements_file = os.path.join(
                 "requirements", "static", requirements_type, pydir, "freebsd.txt"
             )
@@ -262,15 +234,6 @@ def _get_pip_requirements_file(session, transport, crypto=None, requirements_typ
         session.error(f"Could not find a freebsd requirements file for {pydir}")
     else:
         if crypto is None:
-            _requirements_file = os.path.join(
-                "requirements",
-                "static",
-                requirements_type,
-                pydir,
-                f"{transport}-linux.txt",
-            )
-            if os.path.exists(_requirements_file):
-                return _requirements_file
             _requirements_file = os.path.join(
                 "requirements", "static", requirements_type, pydir, "linux.txt"
             )
@@ -319,7 +282,6 @@ def _upgrade_pip_setuptools_and_wheel(session, upgrade=True, onedir=False):
 
 def _install_requirements(
     session,
-    transport,
     *extra_requirements,
     requirements_type="ci",
     onedir=False,
@@ -332,7 +294,7 @@ def _install_requirements(
 
     # Install requirements
     requirements_file = _get_pip_requirements_file(
-        session, transport, requirements_type=requirements_type
+        session, requirements_type=requirements_type
     )
     install_command = ["--progress-bar=off", "-r", requirements_file]
     session.install(*install_command, silent=PIP_INSTALL_SILENT)
@@ -361,7 +323,19 @@ def _install_coverage_requirement(session):
     if SKIP_REQUIREMENTS_INSTALL is False:
         coverage_requirement = COVERAGE_REQUIREMENT
         if coverage_requirement is None:
-            coverage_requirement = "coverage==5.2"
+            coverage_requirement = "coverage==7.3.1"
+            if IS_LINUX:
+                distro_slug = os.environ.get("TOOLS_DISTRO_SLUG")
+                if distro_slug is not None and distro_slug in (
+                    "centos-7",
+                    "debian-10",
+                    "photonos-3",
+                ):
+                    # Keep the old coverage requirement version since the new one, on these
+                    # plaforms turns the test suite quite slow.
+                    # Unit tests don't finish before the 5 hours timeout when they should
+                    # finish within 1 to 2 hours.
+                    coverage_requirement = "coverage==5.2"
         session.install(
             "--progress-bar=off", coverage_requirement, silent=PIP_INSTALL_SILENT
         )
@@ -567,7 +541,7 @@ def test_parametrized(session, coverage, transport, crypto):
     DO NOT CALL THIS NOX SESSION DIRECTLY
     """
     # Install requirements
-    if _install_requirements(session, transport):
+    if _install_requirements(session):
 
         if crypto:
             session_run_always(
@@ -584,7 +558,7 @@ def test_parametrized(session, coverage, transport, crypto):
             install_command = [
                 "--progress-bar=off",
                 "--constraint",
-                _get_pip_requirements_file(session, transport, crypto=True),
+                _get_pip_requirements_file(session, crypto=True),
             ]
             install_command.append(crypto)
             session.install(*install_command, silent=PIP_INSTALL_SILENT)
@@ -992,7 +966,7 @@ def test_tornado(session, coverage):
     """
     # Install requirements
     if _upgrade_pip_setuptools_and_wheel(session):
-        _install_requirements(session, "zeromq")
+        _install_requirements(session)
         session.install(
             "--progress-bar=off", "tornado==5.0.2", silent=PIP_INSTALL_SILENT
         )
@@ -1083,7 +1057,7 @@ def _pytest(session, coverage, cmd_args, env=None, on_rerun=False):
 
 def _ci_test(session, transport, onedir=False):
     # Install requirements
-    _install_requirements(session, transport, onedir=onedir)
+    _install_requirements(session, onedir=onedir)
     env = {}
     if onedir:
         env["ONEDIR_TESTRUN"] = "1"
@@ -1179,7 +1153,14 @@ def _ci_test(session, transport, onedir=False):
 
 @nox.session(python=_PYTHON_VERSIONS, name="ci-test")
 def ci_test(session):
-    _ci_test(session, "zeromq")
+    transport = os.environ.get("SALT_TRANSPORT") or "zeromq"
+    valid_transports = ("zeromq", "tcp")
+    if transport not in valid_transports:
+        session.error(
+            "The value for the SALT_TRANSPORT environment variable can only be "
+            f"one of: {', '.join(valid_transports)}"
+        )
+    _ci_test(session, transport)
 
 
 @nox.session(python=_PYTHON_VERSIONS, name="ci-test-tcp")
@@ -1232,7 +1213,7 @@ def decompress_dependencies(session):
             "Check cicd/images.yml for what's available."
         )
     distro_slug = session.posargs.pop(0)
-    if IS_WINDOWS:
+    if "windows" in distro_slug:
         nox_dependencies_tarball = f"nox.{distro_slug}.tar.gz"
     else:
         nox_dependencies_tarball = f"nox.{distro_slug}.tar.xz"
@@ -1249,7 +1230,7 @@ def decompress_dependencies(session):
 
     session.log("Finding broken 'python' symlinks under '.nox/' ...")
     for dirname in os.scandir(REPO_ROOT / ".nox"):
-        if not IS_WINDOWS:
+        if "windows" not in distro_slug:
             scan_path = REPO_ROOT.joinpath(".nox", dirname, "bin")
         else:
             scan_path = REPO_ROOT.joinpath(".nox", dirname, "Scripts")
@@ -1364,6 +1345,28 @@ def combine_coverage(session):
         pass
 
 
+@nox.session(
+    python=str(ONEDIR_PYTHON_PATH),
+    name="combine-coverage-onedir",
+    venv_params=["--system-site-packages"],
+)
+def combine_coverage_onedir(session):
+    _install_coverage_requirement(session)
+    env = {
+        # The full path to the .coverage data file. Makes sure we always write
+        # them to the same directory
+        "COVERAGE_FILE": str(COVERAGE_FILE),
+    }
+
+    # Always combine and generate the XML coverage report
+    try:
+        session.run("coverage", "combine", env=env)
+    except CommandFailed:
+        # Sometimes some of the coverage files are corrupt which would trigger a CommandFailed
+        # exception
+        pass
+
+
 @nox.session(python="3", name="create-html-coverage-report")
 def create_html_coverage_report(session):
     _install_coverage_requirement(session)
@@ -1702,7 +1705,7 @@ def invoke(session):
     Run invoke tasks
     """
     if _upgrade_pip_setuptools_and_wheel(session):
-        _install_requirements(session, "zeromq")
+        _install_requirements(session)
         requirements_file = os.path.join(
             "requirements", "static", "ci", _get_pydir(session), "invoke.txt"
         )
@@ -1866,10 +1869,25 @@ def build(session):
 
 @nox.session(
     python=str(ONEDIR_PYTHON_PATH),
-    name="test-pkgs-onedir",
+    name="ci-test-onedir-pkgs",
     venv_params=["--system-site-packages"],
 )
-def test_pkgs_onedir(session):
+def ci_test_onedir_pkgs(session):
+    from nox.virtualenv import VirtualEnv
+
+    session_warn(session, "Replacing VirtualEnv instance...")
+
+    ci_test_onedir_path = REPO_ROOT / ".nox" / "ci-test-onedir"
+    session._runner.venv = VirtualEnv(
+        str(ci_test_onedir_path.relative_to(REPO_ROOT)),
+        interpreter=session._runner.func.python,
+        reuse_existing=True,
+        venv=session._runner.venv.venv_or_virtualenv == "venv",
+        venv_params=session._runner.venv.venv_params,
+    )
+    os.environ["VIRTUAL_ENV"] = session._runner.venv.location
+    session._runner.venv.create()
+
     if not ONEDIR_ARTIFACT_PATH.exists():
         session.error(
             "The salt onedir artifact, expected to be in '{}', was not found".format(
@@ -1923,18 +1941,7 @@ def test_pkgs_onedir(session):
 
     # Install requirements
     if _upgrade_pip_setuptools_and_wheel(session, onedir=True):
-        if IS_WINDOWS:
-            file_name = "pkgtests-windows.txt"
-        else:
-            file_name = "pkgtests.txt"
-
-        requirements_file = os.path.join(
-            "requirements", "static", "ci", pydir, file_name
-        )
-
-        install_command = ["--progress-bar=off", "-r", requirements_file]
-        session.install(*install_command, silent=PIP_INSTALL_SILENT)
-
+        _install_requirements(session, "zeromq")
     env = {
         "ONEDIR_TESTRUN": "1",
         "PKG_TEST_TYPE": chunk,
@@ -1942,9 +1949,6 @@ def test_pkgs_onedir(session):
 
     if chunk in ("upgrade-classic", "downgrade-classic"):
         cmd_args.append("--classic")
-        # Workaround for installing and running classic packages from 3005.1
-        # They can only run with importlib-metadata<5.0.0.
-        subprocess.run(["pip3", "install", "importlib-metadata==4.13.0"], check=False)
 
     pytest_args = (
         cmd_args[:]

pkg/tests/conftest.py

@@ -76,7 +76,7 @@ def pytest_addoption(parser):
     """
     test_selection_group = parser.getgroup("Tests Runtime Selection")
     test_selection_group.addoption(
-        "--system-service",
+        "--pkg-system-service",
         default=False,
         action="store_true",
         help="Run the daemons as system services",
@@ -148,7 +148,7 @@ def pytest_runtest_setup(item):
 @pytest.fixture(scope="session")
 def salt_factories_root_dir(request, tmp_path_factory):
     root_dir = SaltPkgInstall.salt_factories_root_dir(
-        request.config.getoption("--system-service")
+        request.config.getoption("--pkg-system-service")
     )
     if root_dir is not None:
         yield root_dir
@@ -169,7 +169,7 @@ def salt_factories_config(salt_factories_root_dir):
     return {
         "code_dir": CODE_DIR,
         "root_dir": salt_factories_root_dir,
-        "system_install": True,
+        "system_service": True,
     }
 
 
@@ -177,7 +177,7 @@ def salt_factories_config(salt_factories_root_dir):
 def install_salt(request, salt_factories_root_dir):
     with SaltPkgInstall(
         conf_dir=salt_factories_root_dir / "etc" / "salt",
-        system_service=request.config.getoption("--system-service"),
+        pkg_system_service=request.config.getoption("--pkg-system-service"),
         upgrade=request.config.getoption("--upgrade"),
         downgrade=request.config.getoption("--downgrade"),
         no_uninstall=request.config.getoption("--no-uninstall"),
@@ -391,7 +391,8 @@ def salt_master(salt_factories, install_salt, state_tree, pillar_tree):
             master_script = False
 
     if master_script:
-        salt_factories.system_install = False
+        salt_factories.system_service = False
+        salt_factories.generate_scripts = True
         scripts_dir = salt_factories.root_dir / "Scripts"
         scripts_dir.mkdir(exist_ok=True)
         salt_factories.scripts_dir = scripts_dir
@@ -401,16 +402,20 @@ def salt_master(salt_factories, install_salt, state_tree, pillar_tree):
             python_executable = install_salt.bin_dir / "python.exe"
         if install_salt.relenv:
             python_executable = install_salt.install_dir / "Scripts" / "python.exe"
+        salt_factories.python_executable = python_executable
         factory = salt_factories.salt_master_daemon(
             random_string("master-"),
             defaults=config_defaults,
             overrides=config_overrides,
             factory_class=SaltMasterWindows,
             salt_pkg_install=install_salt,
-            python_executable=python_executable,
         )
-        salt_factories.system_install = True
+        salt_factories.system_service = True
     else:
+
+        if install_salt.classic and platform.is_darwin():
+            os.environ["PATH"] += ":/opt/salt/bin"
+
         factory = salt_factories.salt_master_daemon(
             random_string("master-"),
             defaults=config_defaults,
@@ -473,11 +478,19 @@ def salt_minion(salt_factories, salt_master, install_salt):
             "winrepo_dir_ng"
         ] = rf"{salt_factories.root_dir}\srv\salt\win\repo_ng"
         config_overrides["winrepo_source_dir"] = r"salt://win/repo_ng"
+
+    if install_salt.classic and platform.is_windows():
+        salt_factories.python_executable = None
+
+    if install_salt.classic and platform.is_darwin():
+        os.environ["PATH"] += ":/opt/salt/bin"
+
     factory = salt_master.salt_minion_daemon(
         minion_id,
         overrides=config_overrides,
         defaults=config_defaults,
     )
+
     # Salt factories calls salt.utils.verify.verify_env
     # which sets root perms on /srv/salt and /srv/pillar since we are running
     # the test suite as root, but we want to run Salt master as salt

pkg/tests/support/helpers.py

@@ -50,8 +50,8 @@ log = logging.getLogger(__name__)
 
 @attr.s(kw_only=True, slots=True)
 class SaltPkgInstall:
+    pkg_system_service: bool = attr.ib(default=False)
     proc: Subprocess = attr.ib(init=False, repr=False)
-    system_service: bool = attr.ib(default=False)
 
     # Paths
     root: pathlib.Path = attr.ib(default=None)
@@ -691,7 +691,7 @@ class SaltPkgInstall:
             ret = self.proc.run(str(self.ssm_bin), "remove", "salt-minion", "confirm")
             self._check_retcode(ret)
 
-            if self.system_service:
+            if self.pkg_system_service:
                 self._install_system_service()
 
         elif platform.is_darwin():
@@ -1246,7 +1246,7 @@ class PkgMixin:
 @attr.s(kw_only=True)
 class DaemonPkgMixin(PkgMixin):
     def __attrs_post_init__(self):
-        if not platform.is_windows() and self.salt_pkg_install.system_service:
+        if not platform.is_windows() and self.salt_pkg_install.pkg_system_service:
             if platform.is_darwin():
                 self.write_launchd_conf()
             else:
@@ -1274,7 +1274,7 @@ class SaltMaster(DaemonPkgMixin, master.SaltMaster):
         DaemonPkgMixin.__attrs_post_init__(self)
 
     def _get_impl_class(self):
-        if self.system_install and self.salt_pkg_install.system_service:
+        if self.system_service and self.salt_pkg_install.pkg_system_service:
             if platform.is_windows():
                 return PkgSsmSaltDaemonImpl
             if platform.is_darwin():
@@ -1355,7 +1355,7 @@ class SaltMinion(DaemonPkgMixin, minion.SaltMinion):
         DaemonPkgMixin.__attrs_post_init__(self)
 
     def _get_impl_class(self):
-        if self.system_install and self.salt_pkg_install.system_service:
+        if self.system_service and self.salt_pkg_install.pkg_system_service:
             if platform.is_windows():
                 return PkgSsmSaltDaemonImpl
             if platform.is_darwin():
@@ -1391,7 +1391,7 @@ class SaltApi(DaemonPkgMixin, api.SaltApi):
         DaemonPkgMixin.__attrs_post_init__(self)
 
     def _get_impl_class(self):
-        if self.system_install and self.salt_pkg_install.system_service:
+        if self.system_service and self.salt_pkg_install.pkg_system_service:
             if platform.is_windows():
                 return PkgSsmSaltDaemonImpl
             if platform.is_darwin():

requirements/pytest.txt

@@ -2,7 +2,7 @@ mock >= 3.0.0
 # PyTest
 docker
 pytest >= 7.2.0
-pytest-salt-factories >= 1.0.0rc26
+pytest-salt-factories >= 1.0.0rc27
 pytest-helpers-namespace >= 2019.1.8
 pytest-subtests
 pytest-timeout

requirements/static/ci/darwin.in

@@ -2,6 +2,7 @@
 # XXX: Temporarily do not install pylxd.
 # pylxd(or likely ws4py) will cause the test suite to hang at the finish line under runtests.py
 # pylxd>=2.2.5
+
 --constraint=../pkg/py{py_version}/{platform}.txt
 
 pygit2>=1.2.0

requirements/static/ci/freebsd.in

@@ -1,4 +1,5 @@
 # FreeBSD static CI requirements
+
 --constraint=../pkg/py{py_version}/{platform}.txt
 
 yamllint

requirements/static/ci/lint.in

@@ -1,4 +1,5 @@
 # Lint requirements
+
 --constraint=./py{py_version}/{platform}.txt
 
 pylint==2.4.4

requirements/static/ci/pkgtests-windows.in

@@ -1,4 +0,0 @@
-cherrypy
-pytest-salt-factories==1.0.0rc17
-pythonnet==3.0.1
-wmi==1.5.1; sys_platform == 'win32'

requirements/static/ci/pkgtests.in

@@ -1,3 +0,0 @@
-cherrypy
-pytest-salt-factories==1.0.0rc17
-docker

requirements/static/ci/py3.10/darwin.txt

@@ -91,7 +91,7 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
     #   -r requirements/base.txt
-croniter==1.3.15 ; sys_platform != "win32"
+croniter==0.3.29 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
 cryptography==41.0.4
     # via
@@ -295,6 +295,8 @@ passlib==1.7.4
     # via -r requirements/static/ci/common.in
 pathspec==0.11.1
     # via yamllint
+pathtools==0.1.2
+    # via watchdog
 platformdirs==3.5.3
     # via virtualenv
 pluggy==1.0.0
@@ -360,7 +362,7 @@ pytest-helpers-namespace==2021.12.29
     #   pytest-shell-utilities
 pytest-httpserver==1.0.8
     # via -r requirements/pytest.txt
-pytest-salt-factories==1.0.0rc26
+pytest-salt-factories==1.0.0rc27
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
@@ -543,7 +545,7 @@ vultr==1.0.1
     # via
     #   -c requirements/static/ci/../pkg/py3.10/darwin.txt
     #   -r requirements/darwin.txt
-watchdog==3.0.0
+watchdog==0.10.3
     # via -r requirements/static/ci/common.in
 websocket-client==0.40.0
     # via

requirements/static/ci/py3.10/freebsd.txt

@@ -87,7 +87,7 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/../pkg/py3.10/freebsd.txt
     #   -r requirements/base.txt
-croniter==1.3.15 ; sys_platform != "win32"
+croniter==0.3.29 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
 cryptography==41.0.4
     # via
@@ -354,7 +354,7 @@ pytest-helpers-namespace==2021.12.29
     #   pytest-shell-utilities
 pytest-httpserver==1.0.8
     # via -r requirements/pytest.txt
-pytest-salt-factories==1.0.0rc26
+pytest-salt-factories==1.0.0rc27
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories

requirements/static/ci/py3.10/linux.txt

@@ -101,7 +101,7 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/../pkg/py3.10/linux.txt
     #   -r requirements/base.txt
-croniter==1.3.15 ; sys_platform != "win32"
+croniter==0.3.29 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
 cryptography==41.0.4
     # via
@@ -388,7 +388,7 @@ pytest-helpers-namespace==2021.12.29
     #   pytest-shell-utilities
 pytest-httpserver==1.0.8
     # via -r requirements/pytest.txt
-pytest-salt-factories==1.0.0rc26
+pytest-salt-factories==1.0.0rc27
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories

requirements/static/ci/py3.10/pkgtests-windows.txt

@@ -1,168 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile --output-file=requirements/static/ci/py3.10/pkgtests-windows.txt requirements/base.txt requirements/static/ci/pkgtests-windows.in requirements/zeromq.txt
-#
-attrs==23.1.0
-    # via
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-    #   pytest-skip-markers
-    #   pytest-system-statistics
-autocommand==2.2.2
-    # via jaraco.text
-certifi==2023.07.22
-    # via requests
-cffi==1.15.1
-    # via
-    #   clr-loader
-    #   cryptography
-charset-normalizer==3.2.0
-    # via requests
-cheroot==10.0.0
-    # via cherrypy
-cherrypy==18.8.0
-    # via -r requirements/static/ci/pkgtests-windows.in
-clr-loader==0.2.5
-    # via pythonnet
-colorama==0.4.6
-    # via pytest
-contextvars==2.4
-    # via -r requirements/base.txt
-cryptography==41.0.4
-    # via -r requirements/crypto.txt
-distlib==0.3.6
-    # via virtualenv
-distro==1.8.0
-    # via
-    #   -r requirements/base.txt
-    #   pytest-skip-markers
-exceptiongroup==1.1.1
-    # via pytest
-filelock==3.12.4
-    # via virtualenv
-idna==3.4
-    # via requests
-immutables==0.15
-    # via contextvars
-inflect==6.0.4
-    # via jaraco.text
-iniconfig==2.0.0
-    # via pytest
-jaraco.collections==4.2.0
-    # via cherrypy
-jaraco.context==4.3.0
-    # via jaraco.text
-jaraco.functools==3.7.0
-    # via
-    #   cheroot
-    #   jaraco.text
-    #   tempora
-jaraco.text==3.11.1
-    # via jaraco.collections
-jinja2==3.1.2
-    # via -r requirements/base.txt
-jmespath==1.0.1
-    # via -r requirements/base.txt
-looseversion==1.2.0
-    # via -r requirements/base.txt
-markupsafe==2.1.3
-    # via
-    #   -r requirements/base.txt
-    #   jinja2
-more-itertools==9.1.0
-    # via
-    #   cheroot
-    #   cherrypy
-    #   jaraco.functools
-    #   jaraco.text
-msgpack==1.0.5
-    # via
-    #   -r requirements/base.txt
-    #   pytest-salt-factories
-packaging==23.1
-    # via
-    #   -r requirements/base.txt
-    #   pytest
-platformdirs==3.5.3
-    # via virtualenv
-pluggy==1.0.0
-    # via pytest
-portend==3.1.0
-    # via cherrypy
-psutil==5.9.5
-    # via
-    #   -r requirements/base.txt
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-    #   pytest-system-statistics
-pycparser==2.21
-    # via cffi
-pycryptodomex==3.9.8
-    # via -r requirements/crypto.txt
-pydantic==1.10.9
-    # via inflect
-pytest-helpers-namespace==2021.12.29
-    # via
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-pytest-salt-factories==1.0.0rc17
-    # via -r requirements/static/ci/pkgtests-windows.in
-pytest-shell-utilities==1.8.0
-    # via pytest-salt-factories
-pytest-skip-markers==1.4.1
-    # via
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-    #   pytest-system-statistics
-pytest-system-statistics==1.0.2
-    # via pytest-salt-factories
-pytest-tempdir==2019.10.12
-    # via pytest-salt-factories
-pytest==7.3.2
-    # via
-    #   pytest-helpers-namespace
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-    #   pytest-skip-markers
-    #   pytest-system-statistics
-    #   pytest-tempdir
-pythonnet==3.0.1
-    # via -r requirements/static/ci/pkgtests-windows.in
-pytz==2023.3
-    # via tempora
-pywin32==306
-    # via
-    #   pytest-skip-markers
-    #   wmi
-pyyaml==6.0.1
-    # via -r requirements/base.txt
-pyzmq==25.1.0
-    # via
-    #   -r requirements/zeromq.txt
-    #   pytest-salt-factories
-requests==2.31.0
-    # via -r requirements/base.txt
-tempora==5.3.0
-    # via portend
-tomli==2.0.1
-    # via pytest
-tornado==6.3.2
-    # via -r requirements/base.txt
-typing-extensions==4.6.3
-    # via
-    #   pydantic
-    #   pytest-shell-utilities
-    #   pytest-system-statistics
-urllib3==1.26.14
-    # via requests
-virtualenv==20.23.0
-    # via pytest-salt-factories
-wmi==1.5.1 ; sys_platform == "win32"
-    # via -r requirements/static/ci/pkgtests-windows.in
-zc.lockfile==3.0.post1
-    # via cherrypy
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools

requirements/static/ci/py3.10/pkgtests.txt

@@ -1,163 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile --output-file=requirements/static/ci/py3.10/pkgtests.txt requirements/base.txt requirements/static/ci/pkgtests.in requirements/zeromq.txt
-#
-attrs==23.1.0
-    # via
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-    #   pytest-skip-markers
-    #   pytest-system-statistics
-autocommand==2.2.2
-    # via jaraco.text
-certifi==2023.07.22
-    # via requests
-cffi==1.15.1
-    # via cryptography
-charset-normalizer==3.2.0
-    # via requests
-cheroot==10.0.0
-    # via cherrypy
-cherrypy==18.8.0
-    # via -r requirements/static/ci/pkgtests.in
-contextvars==2.4
-    # via -r requirements/base.txt
-cryptography==41.0.4
-    # via -r requirements/crypto.txt
-distlib==0.3.6
-    # via virtualenv
-distro==1.8.0
-    # via
-    #   -r requirements/base.txt
-    #   pytest-skip-markers
-docker==6.1.3
-    # via -r requirements/static/ci/pkgtests.in
-exceptiongroup==1.1.1
-    # via pytest
-filelock==3.12.4
-    # via virtualenv
-idna==3.4
-    # via requests
-immutables==0.15
-    # via contextvars
-inflect==6.0.4
-    # via jaraco.text
-iniconfig==2.0.0
-    # via pytest
-jaraco.collections==4.2.0
-    # via cherrypy
-jaraco.context==4.3.0
-    # via jaraco.text
-jaraco.functools==3.7.0
-    # via
-    #   cheroot
-    #   jaraco.text
-    #   tempora
-jaraco.text==3.11.1
-    # via jaraco.collections
-jinja2==3.1.2
-    # via -r requirements/base.txt
-jmespath==1.0.1
-    # via -r requirements/base.txt
-looseversion==1.2.0
-    # via -r requirements/base.txt
-markupsafe==2.1.3
-    # via
-    #   -r requirements/base.txt
-    #   jinja2
-more-itertools==9.1.0
-    # via
-    #   cheroot
-    #   cherrypy
-    #   jaraco.functools
-    #   jaraco.text
-msgpack==1.0.5
-    # via
-    #   -r requirements/base.txt
-    #   pytest-salt-factories
-packaging==23.1
-    # via
-    #   -r requirements/base.txt
-    #   docker
-    #   pytest
-platformdirs==3.5.3
-    # via virtualenv
-pluggy==1.0.0
-    # via pytest
-portend==3.1.0
-    # via cherrypy
-psutil==5.9.5
-    # via
-    #   -r requirements/base.txt
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-    #   pytest-system-statistics
-pycparser==2.21
-    # via cffi
-pycryptodomex==3.9.8
-    # via -r requirements/crypto.txt
-pydantic==1.10.9
-    # via inflect
-pytest-helpers-namespace==2021.12.29
-    # via
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-pytest-salt-factories==1.0.0rc17
-    # via -r requirements/static/ci/pkgtests.in
-pytest-shell-utilities==1.8.0
-    # via pytest-salt-factories
-pytest-skip-markers==1.4.1
-    # via
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-    #   pytest-system-statistics
-pytest-system-statistics==1.0.2
-    # via pytest-salt-factories
-pytest-tempdir==2019.10.12
-    # via pytest-salt-factories
-pytest==7.3.2
-    # via
-    #   pytest-helpers-namespace
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-    #   pytest-skip-markers
-    #   pytest-system-statistics
-    #   pytest-tempdir
-pytz==2023.3
-    # via tempora
-pyyaml==6.0.1
-    # via -r requirements/base.txt
-pyzmq==25.1.0
-    # via
-    #   -r requirements/zeromq.txt
-    #   pytest-salt-factories
-requests==2.31.0
-    # via
-    #   -r requirements/base.txt
-    #   docker
-tempora==5.3.0
-    # via portend
-tomli==2.0.1
-    # via pytest
-tornado==6.3.2
-    # via -r requirements/base.txt
-typing-extensions==4.6.3
-    # via
-    #   pydantic
-    #   pytest-shell-utilities
-    #   pytest-system-statistics
-urllib3==1.26.14
-    # via
-    #   docker
-    #   requests
-virtualenv==20.23.0
-    # via pytest-salt-factories
-websocket-client==1.6.3
-    # via docker
-zc.lockfile==3.0.post1
-    # via cherrypy
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools

requirements/static/ci/py3.10/windows.txt

@@ -315,7 +315,7 @@ pytest-helpers-namespace==2021.12.29
     #   pytest-shell-utilities
 pytest-httpserver==1.0.8
     # via -r requirements/pytest.txt
-pytest-salt-factories==1.0.0rc26
+pytest-salt-factories==1.0.0rc27
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories

requirements/static/ci/py3.11/darwin.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=requirements/static/ci/py3.11/darwin.txt requirements/darwin.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/darwin.in requirements/static/pkg/darwin.in
+#    pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.11/darwin.txt requirements/darwin.txt requirements/pytest.txt requirements/static/ci/common.in requirements/static/ci/darwin.in requirements/static/pkg/darwin.in
 #
 aiohttp==3.8.5
     # via etcd3-py
@@ -358,7 +358,7 @@ pytest-helpers-namespace==2021.12.29
     #   pytest-shell-utilities
 pytest-httpserver==1.0.8
     # via -r requirements/pytest.txt
-pytest-salt-factories==1.0.0rc26
+pytest-salt-factories==1.0.0rc27
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories

requirements/static/ci/py3.11/docs.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=requirements/static/ci/py3.11/docs.txt requirements/static/ci/docs.in
+#    pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.11/docs.txt requirements/static/ci/docs.in
 #
 alabaster==0.7.13
     # via sphinx

requirements/static/ci/py3.11/freebsd-crypto.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=requirements/static/ci/py3.11/freebsd-crypto.txt requirements/static/ci/crypto.in
+#    pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.11/freebsd-crypto.txt requirements/static/ci/crypto.in
 #
 m2crypto==0.38.0
     # via -r requirements/static/ci/crypto.in

requirements/static/ci/py3.11/freebsd.txt

@@ -352,7 +352,7 @@ pytest-helpers-namespace==2021.12.29
     #   pytest-shell-utilities
 pytest-httpserver==1.0.8
     # via -r requirements/pytest.txt
-pytest-salt-factories==1.0.0rc26
+pytest-salt-factories==1.0.0rc27
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories

requirements/static/ci/py3.11/linux.txt

@@ -384,7 +384,7 @@ pytest-helpers-namespace==2021.12.29
     #   pytest-shell-utilities
 pytest-httpserver==1.0.8
     # via -r requirements/pytest.txt
-pytest-salt-factories==1.0.0rc26
+pytest-salt-factories==1.0.0rc27
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories

requirements/static/ci/py3.11/pkgtests-windows.txt

@@ -1,164 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile --output-file=requirements/static/ci/py3.11/pkgtests-windows.txt requirements/base.txt requirements/static/ci/pkgtests-windows.in requirements/zeromq.txt
-#
-attrs==23.1.0
-    # via
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-    #   pytest-skip-markers
-    #   pytest-system-statistics
-autocommand==2.2.2
-    # via jaraco.text
-certifi==2023.07.22
-    # via requests
-cffi==1.15.1
-    # via
-    #   clr-loader
-    #   cryptography
-charset-normalizer==3.2.0
-    # via requests
-cheroot==10.0.0
-    # via cherrypy
-cherrypy==18.8.0
-    # via -r requirements/static/ci/pkgtests-windows.in
-clr-loader==0.2.5
-    # via pythonnet
-colorama==0.4.6
-    # via pytest
-contextvars==2.4
-    # via -r requirements/base.txt
-cryptography==41.0.4
-    # via -r requirements/crypto.txt
-distlib==0.3.6
-    # via virtualenv
-distro==1.8.0
-    # via
-    #   -r requirements/base.txt
-    #   pytest-skip-markers
-filelock==3.12.4
-    # via virtualenv
-idna==3.4
-    # via requests
-immutables==0.15
-    # via contextvars
-inflect==6.0.2
-    # via jaraco.text
-iniconfig==2.0.0
-    # via pytest
-jaraco.collections==4.1.0
-    # via cherrypy
-jaraco.context==4.3.0
-    # via jaraco.text
-jaraco.functools==3.7.0
-    # via
-    #   cheroot
-    #   jaraco.text
-    #   tempora
-jaraco.text==3.11.1
-    # via jaraco.collections
-jinja2==3.1.2
-    # via -r requirements/base.txt
-jmespath==1.0.1
-    # via -r requirements/base.txt
-looseversion==1.2.0
-    # via -r requirements/base.txt
-markupsafe==2.1.2
-    # via
-    #   -r requirements/base.txt
-    #   jinja2
-more-itertools==9.1.0
-    # via
-    #   cheroot
-    #   cherrypy
-    #   jaraco.functools
-    #   jaraco.text
-msgpack==1.0.5
-    # via
-    #   -r requirements/base.txt
-    #   pytest-salt-factories
-packaging==23.1
-    # via
-    #   -r requirements/base.txt
-    #   pytest
-platformdirs==3.5.3
-    # via virtualenv
-pluggy==1.0.0
-    # via pytest
-portend==3.1.0
-    # via cherrypy
-psutil==5.9.5
-    # via
-    #   -r requirements/base.txt
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-    #   pytest-system-statistics
-pycparser==2.21
-    # via cffi
-pycryptodomex==3.9.8
-    # via -r requirements/crypto.txt
-pydantic==1.10.4
-    # via inflect
-pytest-helpers-namespace==2021.12.29
-    # via
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-pytest-salt-factories==1.0.0rc17
-    # via -r requirements/static/ci/pkgtests-windows.in
-pytest-shell-utilities==1.7.0
-    # via pytest-salt-factories
-pytest-skip-markers==1.4.1
-    # via
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-    #   pytest-system-statistics
-pytest-system-statistics==1.0.2
-    # via pytest-salt-factories
-pytest-tempdir==2019.10.12
-    # via pytest-salt-factories
-pytest==7.3.2
-    # via
-    #   pytest-helpers-namespace
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-    #   pytest-skip-markers
-    #   pytest-system-statistics
-    #   pytest-tempdir
-pythonnet==3.0.1
-    # via -r requirements/static/ci/pkgtests-windows.in
-pytz==2023.3
-    # via tempora
-pywin32==306
-    # via
-    #   pytest-skip-markers
-    #   wmi
-pyyaml==6.0.1
-    # via -r requirements/base.txt
-pyzmq==25.1.0
-    # via
-    #   -r requirements/zeromq.txt
-    #   pytest-salt-factories
-requests==2.31.0
-    # via -r requirements/base.txt
-tempora==5.3.0
-    # via portend
-tornado==6.3.2
-    # via -r requirements/base.txt
-typing-extensions==4.6.3
-    # via
-    #   pydantic
-    #   pytest-shell-utilities
-    #   pytest-system-statistics
-urllib3==1.26.14
-    # via requests
-virtualenv==20.23.0
-    # via pytest-salt-factories
-wmi==1.5.1 ; sys_platform == "win32"
-    # via -r requirements/static/ci/pkgtests-windows.in
-zc.lockfile==3.0.post1
-    # via cherrypy
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools

requirements/static/ci/py3.11/pkgtests.txt

@@ -1,159 +0,0 @@
-#
-# This file is autogenerated by pip-compile
-# To update, run:
-#
-#    pip-compile --output-file=requirements/static/ci/py3.11/pkgtests.txt requirements/base.txt requirements/static/ci/pkgtests.in requirements/zeromq.txt
-#
-attrs==23.1.0
-    # via
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-    #   pytest-skip-markers
-    #   pytest-system-statistics
-autocommand==2.2.2
-    # via jaraco.text
-certifi==2023.07.22
-    # via requests
-cffi==1.15.1
-    # via cryptography
-charset-normalizer==3.2.0
-    # via requests
-cheroot==10.0.0
-    # via cherrypy
-cherrypy==18.8.0
-    # via -r requirements/static/ci/pkgtests.in
-contextvars==2.4
-    # via -r requirements/base.txt
-cryptography==41.0.4
-    # via -r requirements/crypto.txt
-distlib==0.3.6
-    # via virtualenv
-distro==1.8.0
-    # via
-    #   -r requirements/base.txt
-    #   pytest-skip-markers
-docker==6.1.3
-    # via -r requirements/static/ci/pkgtests.in
-filelock==3.12.4
-    # via virtualenv
-idna==3.4
-    # via requests
-immutables==0.15
-    # via contextvars
-inflect==6.0.2
-    # via jaraco.text
-iniconfig==2.0.0
-    # via pytest
-jaraco.collections==4.1.0
-    # via cherrypy
-jaraco.context==4.3.0
-    # via jaraco.text
-jaraco.functools==3.7.0
-    # via
-    #   cheroot
-    #   jaraco.text
-    #   tempora
-jaraco.text==3.11.1
-    # via jaraco.collections
-jinja2==3.1.2
-    # via -r requirements/base.txt
-jmespath==1.0.1
-    # via -r requirements/base.txt
-looseversion==1.2.0
-    # via -r requirements/base.txt
-markupsafe==2.1.2
-    # via
-    #   -r requirements/base.txt
-    #   jinja2
-more-itertools==9.1.0
-    # via
-    #   cheroot
-    #   cherrypy
-    #   jaraco.functools
-    #   jaraco.text
-msgpack==1.0.5
-    # via
-    #   -r requirements/base.txt
-    #   pytest-salt-factories
-packaging==23.1
-    # via
-    #   -r requirements/base.txt
-    #   docker
-    #   pytest
-platformdirs==3.5.3
-    # via virtualenv
-pluggy==1.0.0
-    # via pytest
-portend==3.1.0
-    # via cherrypy
-psutil==5.9.5
-    # via
-    #   -r requirements/base.txt
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-    #   pytest-system-statistics
-pycparser==2.21
-    # via cffi
-pycryptodomex==3.9.8
-    # via -r requirements/crypto.txt
-pydantic==1.10.4
-    # via inflect
-pytest-helpers-namespace==2021.12.29
-    # via
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-pytest-salt-factories==1.0.0rc17
-    # via -r requirements/static/ci/pkgtests.in
-pytest-shell-utilities==1.7.0
-    # via pytest-salt-factories
-pytest-skip-markers==1.4.1
-    # via
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-    #   pytest-system-statistics
-pytest-system-statistics==1.0.2
-    # via pytest-salt-factories
-pytest-tempdir==2019.10.12
-    # via pytest-salt-factories
-pytest==7.3.2
-    # via
-    #   pytest-helpers-namespace
-    #   pytest-salt-factories
-    #   pytest-shell-utilities
-    #   pytest-skip-markers
-    #   pytest-system-statistics
-    #   pytest-tempdir
-pytz==2023.3
-    # via tempora
-pyyaml==6.0.1
-    # via -r requirements/base.txt
-pyzmq==25.1.0
-    # via
-    #   -r requirements/zeromq.txt
-    #   pytest-salt-factories
-requests==2.31.0
-    # via
-    #   -r requirements/base.txt
-    #   docker
-tempora==5.3.0
-    # via portend
-tornado==6.3.2
-    # via -r requirements/base.txt
-typing-extensions==4.6.3
-    # via
-    #   pydantic
-    #   pytest-shell-utilities
-    #   pytest-system-statistics
-urllib3==1.26.14
-    # via
-    #   docker
-    #   requests
-virtualenv==20.23.0
-    # via pytest-salt-factories
-websocket-client==1.6.3
-    # via docker
-zc.lockfile==3.0.post1
-    # via cherrypy
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools

requirements/static/ci/py3.11/windows-crypto.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=requirements/static/ci/py3.11/windows-crypto.txt requirements/static/ci/crypto.in
+#    pip-compile --no-emit-index-url --output-file=requirements/static/ci/py3.11/windows-crypto.txt requirements/static/ci/crypto.in
 #
 m2crypto==0.38.0
     # via -r requirements/static/ci/crypto.in

requirements/static/ci/py3.11/windows.txt

@@ -313,7 +313,7 @@ pytest-helpers-namespace==2021.12.29
     #   pytest-shell-utilities
 pytest-httpserver==1.0.8
     # via -r requirements/pytest.txt
-pytest-salt-factories==1.0.0rc26
+pytest-salt-factories==1.0.0rc27
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories

requirements/static/ci/py3.8/freebsd.txt

@@ -87,7 +87,7 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/../pkg/py3.8/freebsd.txt
     #   -r requirements/base.txt
-croniter==1.3.15 ; sys_platform != "win32"
+croniter==0.3.29 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
 cryptography==41.0.4
     # via
@@ -358,7 +358,7 @@ pytest-helpers-namespace==2021.12.29
     #   pytest-shell-utilities
 pytest-httpserver==1.0.8
     # via -r requirements/pytest.txt
-pytest-salt-factories==1.0.0rc26
+pytest-salt-factories==1.0.0rc27
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories

requirements/static/ci/py3.8/linux.txt

@@ -101,7 +101,7 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/../pkg/py3.8/linux.txt
     #   -r requirements/base.txt
-croniter==1.3.15 ; sys_platform != "win32"
+croniter==0.3.29 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
 cryptography==41.0.4
     # via
@@ -392,7 +392,7 @@ pytest-helpers-namespace==2021.12.29
     #   pytest-shell-utilities
 pytest-httpserver==1.0.8
     # via -r requirements/pytest.txt
-pytest-salt-factories==1.0.0rc26
+pytest-salt-factories==1.0.0rc27
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories

requirements/static/ci/py3.8/windows.txt

@@ -319,7 +319,7 @@ pytest-helpers-namespace==2021.12.29
     #   pytest-shell-utilities
 pytest-httpserver==1.0.8
     # via -r requirements/pytest.txt
-pytest-salt-factories==1.0.0rc26
+pytest-salt-factories==1.0.0rc27
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories

requirements/static/ci/py3.9/darwin.txt

@@ -91,7 +91,7 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
     #   -r requirements/base.txt
-croniter==1.3.15 ; sys_platform != "win32"
+croniter==0.3.29 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
 cryptography==41.0.4
     # via
@@ -295,6 +295,8 @@ passlib==1.7.4
     # via -r requirements/static/ci/common.in
 pathspec==0.11.1
     # via yamllint
+pathtools==0.1.2
+    # via watchdog
 platformdirs==3.5.3
     # via virtualenv
 pluggy==1.0.0
@@ -360,7 +362,7 @@ pytest-helpers-namespace==2021.12.29
     #   pytest-shell-utilities
 pytest-httpserver==1.0.8
     # via -r requirements/pytest.txt
-pytest-salt-factories==1.0.0rc26
+pytest-salt-factories==1.0.0rc27
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories
@@ -543,7 +545,7 @@ vultr==1.0.1
     # via
     #   -c requirements/static/ci/../pkg/py3.9/darwin.txt
     #   -r requirements/darwin.txt
-watchdog==3.0.0
+watchdog==0.10.3
     # via -r requirements/static/ci/common.in
 websocket-client==0.40.0
     # via

requirements/static/ci/py3.9/freebsd.txt

@@ -87,7 +87,7 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/../pkg/py3.9/freebsd.txt
     #   -r requirements/base.txt
-croniter==1.3.15 ; sys_platform != "win32"
+croniter==0.3.29 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
 cryptography==41.0.4
     # via
@@ -354,7 +354,7 @@ pytest-helpers-namespace==2021.12.29
     #   pytest-shell-utilities
 pytest-httpserver==1.0.8
     # via -r requirements/pytest.txt
-pytest-salt-factories==1.0.0rc26
+pytest-salt-factories==1.0.0rc27
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories

requirements/static/ci/py3.9/linux.txt

@@ -101,7 +101,7 @@ contextvars==2.4
     # via
     #   -c requirements/static/ci/../pkg/py3.9/linux.txt
     #   -r requirements/base.txt
-croniter==1.3.15 ; sys_platform != "win32"
+croniter==0.3.29 ; sys_platform != "win32"
     # via -r requirements/static/ci/common.in
 cryptography==41.0.4
     # via
@@ -390,7 +390,7 @@ pytest-helpers-namespace==2021.12.29
     #   pytest-shell-utilities
 pytest-httpserver==1.0.8
     # via -r requirements/pytest.txt
-pytest-salt-factories==1.0.0rc26
+pytest-salt-factories==1.0.0rc27
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories

requirements/static/ci/py3.9/windows.txt

@@ -315,7 +315,7 @@ pytest-helpers-namespace==2021.12.29
     #   pytest-shell-utilities
 pytest-httpserver==1.0.8
     # via -r requirements/pytest.txt
-pytest-salt-factories==1.0.0rc26
+pytest-salt-factories==1.0.0rc27
     # via -r requirements/pytest.txt
 pytest-shell-utilities==1.8.0
     # via pytest-salt-factories

requirements/static/pkg/py3.11/freebsd.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=requirements/static/pkg/py3.11/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt
+#    pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.11/freebsd.txt requirements/base.txt requirements/static/pkg/freebsd.in requirements/zeromq.txt
 #
 autocommand==2.2.2
     # via jaraco.text

requirements/static/pkg/py3.11/windows.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile
 # To update, run:
 #
-#    pip-compile --output-file=requirements/static/pkg/py3.11/windows.txt requirements/static/pkg/windows.in requirements/windows.txt
+#    pip-compile --no-emit-index-url --output-file=requirements/static/pkg/py3.11/windows.txt requirements/static/pkg/windows.in requirements/windows.txt
 #
 autocommand==2.2.2
     # via jaraco.text

salt/state.py

@@ -483,19 +483,19 @@ class Compiler:
                     else:
                         fun = 0
                         if "." in state:
+                            # This should not happen usually since `pad_funcs`
+                            # is run on rendered templates
                             fun += 1
                         for arg in body[state]:
                             if isinstance(arg, str):
                                 fun += 1
                                 if " " in arg.strip():
                                     errors.append(
-                                        'The function "{}" in state '
-                                        '"{}" in SLS "{}" has '
+                                        f'The function "{arg}" in state '
+                                        f'"{name}" in SLS "{body["__sls__"]}" has '
                                         "whitespace, a function with whitespace is "
-                                        "not supported, perhaps this is an argument "
-                                        'that is missing a ":"'.format(
-                                            arg, name, body["__sls__"]
-                                        )
+                                        "not supported, perhaps this is an argument"
+                                        ' that is missing a ":"'
                                     )
                             elif isinstance(arg, dict):
                                 # The arg is a dict, if the arg is require or
@@ -591,14 +591,22 @@ class Compiler:
                             if state == "require" or state == "watch":
                                 continue
                             errors.append(
-                                "No function declared in state '{}' in SLS '{}'".format(
-                                    state, body["__sls__"]
-                                )
+                                f"No function declared in state '{name}' in SLS "
+                                f"'{body['__sls__']}'"
                             )
                         elif fun > 1:
+                            funs = (
+                                [state.split(".", maxsplit=1)[1]]
+                                if "." in state
+                                else []
+                            )
+                            funs.extend(
+                                arg for arg in body[state] if isinstance(arg, str)
+                            )
                             errors.append(
-                                "Too many functions declared in state '{}' in "
-                                "SLS '{}'".format(state, body["__sls__"])
+                                f"Too many functions declared in state '{name}' in "
+                                f"SLS '{body['__sls__']}'. Please choose one of "
+                                "the following: " + ", ".join(funs)
                             )
         return errors
 
@@ -1506,17 +1514,21 @@ class State:
                 else:
                     fun = 0
                     if "." in state:
+                        # This should not happen usually since `_handle_state_decls`
+                        # is run on rendered templates
                         fun += 1
                     for arg in body[state]:
                         if isinstance(arg, str):
                             fun += 1
                             if " " in arg.strip():
                                 errors.append(
-                                    'The function "{}" in state "{}" in SLS "{}" has '
-                                    "whitespace, a function with whitespace is not "
-                                    "supported, perhaps this is an argument that is "
-                                    'missing a ":"'.format(arg, name, body["__sls__"])
+                                    f'The function "{arg}" in state '
+                                    f'"{name}" in SLS "{body["__sls__"]}" has '
+                                    "whitespace, a function with whitespace is "
+                                    "not supported, perhaps this is an argument"
+                                    ' that is missing a ":"'
                                 )
+
                         elif isinstance(arg, dict):
                             # The arg is a dict, if the arg is require or
                             # watch, it must be a list.
@@ -1609,14 +1621,16 @@ class State:
                         if state == "require" or state == "watch":
                             continue
                         errors.append(
-                            "No function declared in state '{}' in SLS '{}'".format(
-                                state, body["__sls__"]
-                            )
+                            f"No function declared in state '{name}' in SLS "
+                            f"'{body['__sls__']}'"
                         )
                     elif fun > 1:
+                        funs = [state.split(".", maxsplit=1)[1]] if "." in state else []
+                        funs.extend(arg for arg in body[state] if isinstance(arg, str))
                         errors.append(
-                            "Too many functions declared in state '{}' in "
-                            "SLS '{}'".format(state, body["__sls__"])
+                            f"Too many functions declared in state '{name}' in "
+                            f"SLS '{body['__sls__']}'. Please choose one of "
+                            "the following: " + ", ".join(funs)
                         )
         return errors
 

tests/conftest.py

@@ -396,9 +396,10 @@ def set_max_open_files_limits(min_soft=3072, min_hard=4096):
     return soft, hard
 
 
-def pytest_report_header():
+def pytest_report_header(config):
     soft, hard = set_max_open_files_limits()
-    return f"max open files; soft: {soft}; hard: {hard}"
+    transport = config.getoption("--transport")
+    return f"max open files: soft={soft}; hard={hard}\nsalt-transport: {transport}"
 
 
 def pytest_itemcollected(item):

tests/pytests/scenarios/swarm/conftest.py

@@ -41,7 +41,7 @@ def salt_cli(salt_master):
 @pytest.fixture(scope="package")
 def minion_count():
     # Allow this to be changed via an environment variable if needed
-    return int(os.environ.get("SALT_CI_MINION_SWARM_COUNT", 20))
+    return int(os.environ.get("SALT_CI_MINION_SWARM_COUNT", 15))
 
 
 @pytest.fixture(scope="package")
@@ -53,7 +53,7 @@ def minion_swarm(salt_master, minion_count):
     with ExitStack() as stack:
         for idx in range(minion_count):
             minion_factory = salt_master.salt_minion_daemon(
-                random_string("swarm-minion-{}-".format(idx)),
+                random_string(f"swarm-minion-{idx}-"),
                 extra_cli_arguments_after_first_start_failure=["--log-level=info"],
             )
             stack.enter_context(minion_factory.started())

tests/pytests/unit/state/test_reactor_compiler.py

@@ -416,7 +416,7 @@ def test_compiler_verify_high_short_sls(minion_opts, tmp_path, high, exp):
             },
             [
                 "The require statement in state 'add_test_2' in SLS '/srv/reactor/start.sls' needs to be formed as a list",
-                "Too many functions declared in state 'local.cmd.run' in SLS '/srv/reactor/start.sls'",
+                "Too many functions declared in state 'add_test_2' in SLS '/srv/reactor/start.sls'. Please choose one of the following: cmd.run, cmd.run",
             ],
         ),
         (

tests/pytests/unit/state/test_state_compiler.py

@@ -1099,3 +1099,47 @@ def test_verify_onlyif_cmd_opts_exclude(minion_opts):
                 timeout=5,
                 success_retcodes=1,
             )
+
+
+@pytest.mark.parametrize("verifier", (salt.state.State, salt.state.Compiler))
+@pytest.mark.parametrize(
+    "high,err_msg",
+    (
+        (
+            {"/some/file": {"file.managed": ["source:salt://bla"]}},
+            "Too many functions declared in state '/some/file' in SLS 'sls'. Please choose one of the following: managed, source:salt://bla",
+        ),
+        (
+            {"/some/file": {"file": ["managed", "source:salt://bla"]}},
+            "Too many functions declared in state '/some/file' in SLS 'sls'. Please choose one of the following: managed, source:salt://bla",
+        ),
+    ),
+)
+def test_verify_high_too_many_functions_declared_error_message(
+    high, err_msg, minion_opts, verifier
+):
+    """
+    Ensure the error message when a list item of a state call is
+    accidentally passed as a string instead of a single-item dict
+    is more meaningful. Example:
+
+    /some/file:
+      file.managed:
+        - source:salt://bla
+
+    /some/file:
+      file:
+        - managed
+        - source:salt://bla
+
+    Issue #38098.
+    """
+    high[next(iter(high))]["__sls__"] = "sls"
+    with patch("salt.state.State._gather_pillar"):
+        if verifier is salt.state.Compiler:
+            state_obj = verifier(minion_opts, [])
+        else:
+            state_obj = verifier(minion_opts)
+        res = state_obj.verify_high(high)
+        assert isinstance(res, list)
+        assert any(err_msg in x for x in res)

tools/ci.py

@@ -638,33 +638,6 @@ def matrix(ctx: Context, distro_slug: str):
     ctx.exit(0)
 
 
-@ci.command(
-    name="transport-matrix",
-    arguments={
-        "distro_slug": {
-            "help": "The distribution slug to generate the matrix for",
-        },
-    },
-)
-def transport_matrix(ctx: Context, distro_slug: str):
-    """
-    Generate the test matrix.
-    """
-    _matrix = []
-    for transport in ("zeromq", "tcp"):
-        if transport == "tcp":
-            if distro_slug not in (
-                "centosstream-9",
-                "ubuntu-22.04",
-                "ubuntu-22.04-arm64",
-            ):
-                # Only run TCP transport tests on these distributions
-                continue
-        _matrix.append({"transport": transport})
-    print(json.dumps(_matrix))
-    ctx.exit(0)
-
-
 @ci.command(
     name="pkg-matrix",
     arguments={
@@ -767,6 +740,8 @@ def pkg_matrix(
                     "version": version,
                 }
             )
+            if distro_slug.startswith("windows"):
+                matrix[-1]["pkg-type"] = pkg_type.upper()
     ctx.info("Generated matrix:")
     ctx.print(matrix, soft_wrap=True)
 

tools/vm.py

@@ -860,6 +860,7 @@ class VM:
               StrictHostKeyChecking=no
               UserKnownHostsFile=/dev/null
               ForwardAgent={forward_agent}
+              PasswordAuthentication no
             """
         )
         self.ssh_config_file.write_text(ssh_config)
@@ -1330,6 +1331,7 @@ class VM:
         if not env:
             return
         write_env = {k: str(v) for (k, v) in env.items()}
+        write_env["TOOLS_DISTRO_SLUG"] = self.name
         write_env_filename = ".ci-env"
         write_env_filepath = tools.utils.REPO_ROOT / ".ci-env"
         write_env_filepath.write_text(json.dumps(write_env))
@@ -1431,7 +1433,7 @@ class VM:
         """
         Combine the code coverage databases
         """
-        return self.run_nox("combine-coverage", session_args=[self.name])
+        return self.run_nox("combine-coverage-onedir", session_args=[self.name])
 
     def create_xml_coverage_reports(self):
         """