Merge 3006.x into 3007.x

.github/actions/build-onedir-deps/action.yml

@@ -1,45 +1,33 @@
 ---
 name: build-onedir-deps
 description: Build Onedir Dependencies
+
 inputs:
   platform:
     required: true
-    type: string
     description: The platform to build
   arch:
     required: true
-    type: string
     description: The platform arch to build
   python-version:
     required: true
-    type: string
     description: The python version to build
   package-name:
     required: false
-    type: string
     description: The onedir package name to create
     default: salt
   cache-prefix:
     required: true
-    type: string
     description: Seed used to invalidate caches
 
 
-env:
-  COLUMNS: 190
-  PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
-  PIP_EXTRA_INDEX_URL: https://pypi.org/simple
-  RELENV_BUILDENV: 1
-
-
 runs:
   using: composite
 
   steps:
-
     - name: Cache Deps Onedir Package Directory
       id: onedir-pkg-cache
-      uses: actions/cache@v3.3.1
+      uses: ./.github/actions/cache
       with:
         path: artifacts/${{ inputs.package-name }}
         key: >
@@ -56,6 +44,8 @@ runs:
     - name: Install Salt Onedir Package Dependencies
       shell: bash
       if: steps.onedir-pkg-cache.outputs.cache-hit != 'true'
+      env:
+        RELENV_BUILDENV: "1"
       run: |
         tools pkg build onedir-dependencies --arch ${{ inputs.arch }} --python-version ${{ inputs.python-version }} --package-name artifacts/${{ inputs.package-name }} --platform ${{ inputs.platform }}
 

.github/actions/build-onedir-salt/action.yml

@@ -1,41 +1,29 @@
 ---
 name: build-onedir-salt
 description: Build Onedir Package
+
 inputs:
   platform:
     required: true
-    type: string
     description: The platform to build
   arch:
     required: true
-    type: string
     description: The platform arch to build
   package-name:
     required: false
-    type: string
     description: The onedir package name to create
     default: salt
   cache-prefix:
     required: true
-    type: string
     description: Seed used to invalidate caches
   python-version:
     required: true
-    type: string
     description: The python version to build
   salt-version:
-    type: string
     required: true
     description: The Salt version to set prior to building packages.
 
 
-env:
-  COLUMNS: 190
-  PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
-  PIP_EXTRA_INDEX_URL: https://pypi.org/simple
-  RELENV_BUILDENV: 1
-
-
 runs:
   using: composite
 
@@ -43,7 +31,7 @@ runs:
 
     - name: Download Cached Deps Onedir Package Directory
       id: onedir-bare-cache
-      uses: actions/cache@v3.3.1
+      uses: ./.github/actions/cache
       with:
         path: artifacts/${{ inputs.package-name }}
         key: >
@@ -64,6 +52,8 @@ runs:
 
     - name: Install Salt Into Onedir
       shell: bash
+      env:
+        RELENV_BUILDENV: "1"
       run: |
         tools pkg build salt-onedir salt-${{ inputs.salt-version }}.tar.gz --platform ${{ inputs.platform }} --package-name artifacts/${{ inputs.package-name }}
 

.github/actions/build-source-tarball/action.yml

@@ -1,24 +1,17 @@
 ---
 name: build-source-tarball
 description: Build Source Tarball
+
 inputs:
   salt-version:
-    type: string
     required: true
     description: The Salt version to set prior to building the tarball.
   nox-version:
     required: false
-    type: string
     description: The version of Nox to install
     default: "2022.8.7"
 
 
-env:
-  COLUMNS: 190
-  PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
-  PIP_EXTRA_INDEX_URL: https://pypi.org/simple
-
-
 runs:
   using: composite
 

.github/actions/cache/action.yml

@@ -0,0 +1,112 @@
+---
+name: cache
+description: GitHub Actions Cache
+inputs:
+  path:
+    description: 'A list of files, directories, and wildcard patterns to cache and restore'
+    required: true
+  key:
+    description: 'An explicit key for restoring and saving the cache'
+    required: true
+  restore-keys:
+    description: 'An ordered list of keys to use for restoring stale cache if no cache hit occurred for key. Note `cache-hit` returns false in this case.'
+    required: false
+  upload-chunk-size:
+    description: 'The chunk size used to split up large files during upload, in bytes'
+    required: false
+  enableCrossOsArchive:
+    description: 'An optional boolean when enabled, allows windows runners to save or restore caches that can be restored or saved respectively on other platforms'
+    default: 'false'
+    required: false
+  fail-on-cache-miss:
+    description: 'Fail the workflow if cache entry is not found'
+    default: 'false'
+    required: false
+  lookup-only:
+    description: 'Check if a cache entry exists for the given input(s) (key, restore-keys) without downloading the cache'
+    default: 'false'
+    required: false
+  save-always:
+    description: 'Run the post step to save the cache even if another step before fails'
+    default: 'false'
+    required: false
+
+outputs:
+  cache-hit:
+    description: 'A boolean value to indicate an exact match was found for the primary key'
+    value: ${{ steps.github-cache.outputs.cache-hit || steps.s3-cache.outputs.cache-hit }}
+
+runs:
+  using: composite
+
+  steps:
+
+    - name: Map inputs to environment variables
+      shell: bash
+      run: |
+        echo "GHA_CACHE_PATH=${{ inputs.path }}" | tee -a "${GITHUB_ENV}"
+        echo "GHA_CACHE_KEY=${{ inputs.key }}" | tee -a "${GITHUB_ENV}"
+        echo "GHA_CACHE_ENABLE_CROSS_OS_ARCHIVE=${{ inputs.enableCrossOsArchive }}" | tee -a "${GITHUB_ENV}"
+        echo "GHA_CACHE_FAIL_ON_CACHE_MISS=${{ inputs.fail-on-cache-miss }}" | tee -a "${GITHUB_ENV}"
+        echo "GHA_CACHE_LOOKUP_ONLY=${{ inputs.lookup-only }}" | tee -a "${GITHUB_ENV}"
+        echo "GHA_CACHE_SAVE_ALWAYS=${{ inputs.save-always }}" | tee -a "${GITHUB_ENV}"
+        echo "GHA_CACHE_RESTORE_KEYS=${{ inputs.restore-keys }}" | tee -a "${GITHUB_ENV}"
+        echo "GHA_CACHE_UPLOAD_CHUNK_SIZE=${{ inputs.upload-chunk-size }}" | tee -a "${GITHUB_ENV}"
+
+    - name: Cache Provided Path (GitHub Actions)
+      id: github-cache
+      if: ${{ env.USE_S3_CACHE != 'true' }}
+      uses: actions/cache@v4
+      with:
+        path: ${{ env.GHA_CACHE_PATH }}
+        key: ${{ env.GHA_CACHE_KEY }}
+        enableCrossOsArchive: ${{ env.GHA_CACHE_ENABLE_CROSS_OS_ARCHIVE }}
+        fail-on-cache-miss: ${{ env.GHA_CACHE_FAIL_ON_CACHE_MISS }}
+        lookup-only: ${{ env.GHA_CACHE_LOOKUP_ONLY }}
+        save-always: ${{ env.GHA_CACHE_SAVE_ALWAYS }}
+        restore-keys: ${{ env.GHA_CACHE_RESTORE_KEYS }}
+        upload-chunk-size: ${{ env.GHA_CACHE_UPLOAD_CHUNK_SIZE }}
+
+    - name: Get Salt Project GitHub Actions Bot Environment
+      if: ${{ env.USE_S3_CACHE == 'true' }}
+      shell: bash
+      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" | tee -a "$GITHUB_ENV"
+        REGION=$(curl -sS -f -H "X-aws-ec2-metadata-token: $TOKEN" http://169.254.169.254/latest/meta-data/placement/region)
+        echo "GHA_CACHE_AWS_REGION=$REGION" | tee -a "$GITHUB_ENV"
+
+    - name: Configure AWS Credentials to access cache bucket
+      id: creds
+      if: ${{ env.USE_S3_CACHE == 'true' }}
+      uses: aws-actions/configure-aws-credentials@v4
+      with:
+        aws-region: ${{ env.GHA_CACHE_AWS_REGION }}
+
+    - name: Cache Provided Path (S3)
+      if: ${{ env.USE_S3_CACHE == 'true' }}
+      id: s3-cache
+      env:
+        AWS_REGION: ${{ env.GHA_CACHE_AWS_REGION }}
+        RUNS_ON_S3_BUCKET_CACHE: salt-project-${{ env.SPB_ENVIRONMENT}}-salt-github-actions-s3-cache
+      uses: runs-on/cache@v4
+      with:
+        path: ${{ env.GHA_CACHE_PATH }}
+        key: ${{ env.GHA_CACHE_KEY }}
+        enableCrossOsArchive: ${{ env.GHA_CACHE_ENABLE_CROSS_OS_ARCHIVE }}
+        fail-on-cache-miss: ${{ env.GHA_CACHE_FAIL_ON_CACHE_MISS }}
+        lookup-only: ${{ env.GHA_CACHE_LOOKUP_ONLY }}
+        save-always: ${{ env.GHA_CACHE_SAVE_ALWAYS }}
+        restore-keys: ${{ env.GHA_CACHE_RESTORE_KEYS }}
+        upload-chunk-size: ${{ env.GHA_CACHE_UPLOAD_CHUNK_SIZE }}
+
+    - name: Verify 'fail-on-cache-miss'
+      if: ${{ inputs.fail-on-cache-miss == 'true' }}
+      shell: bash
+      run: |
+        CACHE_HIT="${{ steps.github-cache.outputs.cache-hit || steps.s3-cache.outputs.cache-hit }}"
+        if [ "$CACHE_HIT" != "true" ]; then
+          echo "No cache hit and fail-on-cache-miss is set to true."
+          exit 1
+        fi

.github/actions/cached-virtualenv/action.yml

@@ -5,26 +5,23 @@ description: Setup a cached python virtual environment
 inputs:
   name:
     required: true
-    type: string
     description: The Virtualenv Name
   cache-seed:
     required: true
-    type: string
     description: Seed used to invalidate caches
+
 outputs:
   cache-hit:
+    description: 'A boolean value to indicate an exact match was found for the primary key'
     value: ${{ steps.cache-virtualenv.outputs.cache-hit }}
   cache-key:
+    description: The value of the cache key
     value: ${{ steps.setup-cache-key.outputs.cache-key }}
   python-executable:
+    description: The path to the virtualenv's python executable
     value: ${{ steps.define-python-executable.outputs.python-executable }}
 
 
-env:
-  PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
-  PIP_EXTRA_INDEX_URL: https://pypi.org/simple
-
-
 runs:
   using: composite
 
@@ -54,7 +51,7 @@ runs:
 
     - name: Cache VirtualEnv
       id: cache-virtualenv
-      uses: actions/cache@v3.3.1
+      uses: ./.github/actions/cache
       with:
         key: ${{ steps.setup-cache-key.outputs.cache-key }}
         path: ${{ steps.virtualenv-path.outputs.venv-path }}

.github/actions/download-artifact/action.yml

@@ -20,6 +20,7 @@ inputs:
       without overriding the existing archives.
     required: false
 
+
 runs:
   using: composite
   steps:

.github/actions/get-python-version/action.yml

@@ -1,19 +1,24 @@
 ---
 name: get-python-version
 description: Setup Relenv
+
 inputs:
   python-binary:
     required: true
-    type: string
     description: The python binary to get the version from
+
 outputs:
   binary:
+    description: The python binary executable
     value: ${{ steps.get-python-version.outputs.binary }}
   version:
+    description: The python version
     value: ${{ steps.get-python-version.outputs.version }}
   full-version:
+    description: The full python version
     value: ${{ steps.get-python-version.outputs.full-version }}
   version-sha256sum:
+    description: The sha256sum of the version
     value: ${{ steps.get-python-version.outputs.version-sha256sum }}
 
 

.github/actions/setup-actionlint/action.yml

@@ -1,21 +1,22 @@
 ---
 name: setup-actionlint
 description: Setup actionlint
+
 inputs:
   version:
     description: The version of actionlint
     default: 1.6.26
   cache-seed:
     required: true
-    type: string
     description: Seed used to invalidate caches
 
+
 runs:
   using: composite
   steps:
 
     - name: Cache actionlint Binary
-      uses: actions/cache@v3.3.1
+      uses: ./.github/actions/cache
       with:
         path: /usr/local/bin/actionlint
         key: ${{ inputs.cache-seed }}|${{ runner.os }}|${{ runner.arch }}|actionlint|${{ inputs.version }}

.github/actions/setup-pre-commit/action.yml

@@ -4,19 +4,13 @@ description: Setup 'pre-commit'
 
 inputs:
   version:
-    type: string
     description: Pre-commit version to install
     required: true
     default: 3.0.3
   cache-seed:
     required: true
-    type: string
     description: Seed used to invalidate caches
 
-env:
-  PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
-  PIP_EXTRA_INDEX_URL: https://pypi.org/simple
-
 
 runs:
   using: composite
@@ -36,7 +30,7 @@ runs:
         ${{ steps.pre-commit-virtualenv.outputs.python-executable }} -m pip install pre-commit==${{ inputs.version }}
 
     - name: Cache Pre-Commit Hooks
-      uses: actions/cache@v3.3.1
+      uses: ./.github/actions/cache
       id: pre-commit-hooks-cache
       with:
         key: ${{ steps.pre-commit-virtualenv.outputs.cache-key }}|${{ inputs.version }}|${{ hashFiles('.pre-commit-config.yaml') }}

.github/actions/setup-python-tools-scripts/action.yml

@@ -5,23 +5,17 @@ description: Setup 'python-tools-scripts'
 inputs:
   cache-prefix:
     required: true
-    type: string
     description: Seed used to invalidate caches
   cwd:
-    type: string
     description: The directory the salt checkout is located in
     default: "."
 
 outputs:
   version:
+    description: "Return the python-tools-scripts version"
     value: ${{ steps.get-version.outputs.version }}
 
 
-env:
-  PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
-  PIP_EXTRA_INDEX_URL: https://pypi.org/simple
-
-
 runs:
   using: composite
 
@@ -50,7 +44,7 @@ runs:
         cache-seed: tools|${{ steps.venv-hash.outputs.venv-hash }}
 
     - name: Restore Python Tools Virtualenvs Cache
-      uses: actions/cache@v3.3.1
+      uses: ./.github/actions/cache
       with:
         path: ${{ inputs.cwd }}/.tools-venvs
         key: ${{ inputs.cache-prefix }}|${{ steps.venv-hash.outputs.venv-hash }}

.github/actions/setup-relenv/action.yml

@@ -1,39 +1,31 @@
 ---
 name: setup-relenv
 description: Setup Relenv
+
 inputs:
   platform:
     required: true
-    type: string
     description: The platform to build
   arch:
     required: true
-    type: string
     description: The platform arch to build
   python-version:
     required: true
-    type: string
     description: The version of python to build
   cache-seed:
     required: true
-    type: string
     description: Seed used to invalidate caches
   version:
     required: false
-    type: string
     description: The version of relenv to use
     default: 0.13.2
 
 outputs:
   version:
+    description: The relenv version
     value: ${{ inputs.version }}
 
 
-env:
-  PIP_INDEX_URL: https://pypi-proxy.saltstack.net/root/local/+simple/
-  PIP_EXTRA_INDEX_URL: https://pypi.org/simple
-
-
 runs:
   using: composite
 
@@ -45,7 +37,7 @@ runs:
         python3 -m pip install relenv==${{ inputs.version }}
 
     - name: Cache Relenv Data Directory
-      uses: actions/cache@v3.3.1
+      uses: ./.github/actions/cache
       with:
         path: ${{ github.workspace }}/.relenv
         key: ${{ inputs.cache-seed }}|relenv|${{ inputs.version }}|${{ inputs.python-version }}|${{ inputs.platform }}|${{ inputs.arch }}

.github/actions/setup-salt-version/action.yml

@@ -1,32 +1,29 @@
 ---
 name: setup-salt-version
 description: Setup Salt Version
+
 inputs:
   cwd:
-    type: string
     default: ""
+    description: The current working directory to use
   salt-version:
-    type: string
     default: ""
     description: >
       The Salt version to set prior to running tests or building packages.
       If not set, it is discover at run time, like, for example, capturing
       the output of running `python3 salt/version.py`
   validate-version:
-    type: boolean
-    default: false
+    default: "false"
     description: Validate the passed version.
   release:
-    type: boolean
-    default: false
+    default: "false"
     description: This is a release of salt.
+
 outputs:
   salt-version:
     value: ${{ steps.setup-salt-version.outputs.salt-version }}
     description: The Salt version written to `salt/_version.txt`
 
-env:
-  COLUMNS: 190
 
 runs:
   using: composite

.github/actions/setup-shellcheck/action.yml

@@ -1,21 +1,22 @@
 ---
 name: setup-shellcheck
 description: Setup shellcheck
+
 inputs:
   version:
     description: The version of shellcheck
     default: v0.9.0
   cache-seed:
     required: true
-    type: string
     description: Seed used to invalidate caches
 
+
 runs:
   using: composite
   steps:
 
     - name: Cache shellcheck Binary
-      uses: actions/cache@v3.3.1
+      uses: ./.github/actions/cache
       with:
         path: /usr/local/bin/shellcheck
         key: ${{ inputs.cache-seed }}|${{ runner.os }}|${{ runner.arch }}|shellcheck|${{ inputs.version }}

.github/actions/upload-artifact/action.yml

@@ -37,6 +37,7 @@ inputs:
       without overriding the existing archives.
     required: false
 
+
 runs:
   using: composite
   steps:

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

@@ -53,6 +53,8 @@ jobs:
       - self-hosted
       - linux
       - bastion
+    env:
+      USE_S3_CACHE: 'true'
     timeout-minutes: 90
     strategy:
       fail-fast: false
@@ -74,7 +76,7 @@ jobs:
 
       - name: Cache nox.linux.${{ matrix.arch }}.tar.* for session ${{ inputs.nox-session }}
         id: nox-dependencies-cache
-        uses: actions/cache@v3.3.1
+        uses: ./.github/actions/cache
         with:
           path: nox.linux.${{ matrix.arch }}.tar.*
           key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|linux|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ inputs.nox-archive-hash }}
@@ -183,7 +185,7 @@ jobs:
 
       - name: Cache nox.macos.${{ matrix.arch }}.tar.* for session ${{ inputs.nox-session }}
         id: nox-dependencies-cache
-        uses: actions/cache@v3.3.1
+        uses: ./.github/actions/cache
         with:
           path: nox.macos.${{ matrix.arch }}.tar.*
           key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|macos|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ inputs.nox-archive-hash }}
@@ -253,6 +255,8 @@ jobs:
       - self-hosted
       - linux
       - bastion
+    env:
+      USE_S3_CACHE: 'true'
     timeout-minutes: 90
     strategy:
       fail-fast: false
@@ -272,7 +276,7 @@ jobs:
 
       - name: Cache nox.windows.${{ matrix.arch }}.tar.* for session ${{ inputs.nox-session }}
         id: nox-dependencies-cache
-        uses: actions/cache@v3.3.1
+        uses: ./.github/actions/cache
         with:
           path: nox.windows.${{ matrix.arch }}.tar.*
           key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|windows|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ inputs.nox-archive-hash }}

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

@@ -51,6 +51,8 @@ jobs:
       - self-hosted
       - linux
       - ${{ matrix.arch }}
+    env:
+      USE_S3_CACHE: 'true'
     steps:
 
       - name: "Throttle Builds"
@@ -95,7 +97,8 @@ jobs:
           - arm64
     runs-on:
       - ${{ matrix.arch == 'arm64' && 'macos-13-xlarge' || 'macos-12' }}
-
+    env:
+      USE_S3_CACHE: 'false'
     steps:
 
       - name: "Throttle Builds"
@@ -144,6 +147,8 @@ jobs:
           - x86
           - amd64
     runs-on: windows-latest
+    env:
+      USE_S3_CACHE: 'false'
     steps:
 
       - name: "Throttle Builds"

.github/workflows/build-docs.yml

@@ -69,7 +69,7 @@ jobs:
 
       - name: Cache Python Tools Docs Virtualenv
         id: tools-venvs-dependencies-cache
-        uses: actions/cache@v3.3.1
+        uses: ./.github/actions/cache
         with:
           path: .tools-venvs/docs
           key: ${{ inputs.cache-seed }}|${{ github.workflow }}|${{ github.job }}|tools-venvs|${{ steps.python-tools-scripts.outputs.version }}|docs|${{ steps.get-python-version.outputs.version }}|${{ hashFiles('requirements/**/docs.txt') }}

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

@@ -41,6 +41,8 @@ jobs:
   build-salt-linux:
     name: Linux
     if: ${{ inputs.self-hosted-runners }}
+    env:
+      USE_S3_CACHE: 'true'
     strategy:
       fail-fast: false
       matrix:

.github/workflows/ci.yml

@@ -16,7 +16,7 @@ on:
 
 env:
   COLUMNS: 190
-  CACHE_SEED: SEED-4  # Bump the number to invalidate all caches
+  CACHE_SEED: SEED-1  # Bump the number to invalidate all caches
   RELENV_DATA: "${{ github.workspace }}/.relenv"
   PIP_DISABLE_PIP_VERSION_CHECK: "1"
   RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"

.github/workflows/nightly.yml

@@ -22,7 +22,7 @@ on:
 
 env:
   COLUMNS: 190
-  CACHE_SEED: SEED-4  # Bump the number to invalidate all caches
+  CACHE_SEED: SEED-1  # Bump the number to invalidate all caches
   RELENV_DATA: "${{ github.workspace }}/.relenv"
   PIP_DISABLE_PIP_VERSION_CHECK: "1"
   RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
@@ -2031,6 +2031,8 @@ jobs:
       - self-hosted
       - linux
       - repo-nightly
+    env:
+      USE_S3_CACHE: 'true'
     needs:
       - prepare-workflow
       - build-source-tarball
@@ -2131,6 +2133,8 @@ jobs:
       - self-hosted
       - linux
       - repo-nightly
+    env:
+      USE_S3_CACHE: 'true'
     needs:
       - prepare-workflow
       - build-pkgs-onedir
@@ -2268,6 +2272,8 @@ jobs:
       - self-hosted
       - linux
       - repo-nightly
+    env:
+      USE_S3_CACHE: 'true'
     needs:
       - prepare-workflow
       - build-pkgs-onedir
@@ -2456,6 +2462,8 @@ jobs:
       - self-hosted
       - linux
       - repo-nightly
+    env:
+      USE_S3_CACHE: 'true'
     needs:
       - prepare-workflow
       - build-pkgs-onedir
@@ -2558,6 +2566,8 @@ jobs:
       - self-hosted
       - linux
       - repo-nightly
+    env:
+      USE_S3_CACHE: 'true'
     needs:
       - prepare-workflow
       - build-pkgs-onedir
@@ -2648,6 +2658,8 @@ jobs:
       - self-hosted
       - linux
       - repo-nightly
+    env:
+      USE_S3_CACHE: 'true'
     needs:
       - prepare-workflow
       - build-salt-onedir

.github/workflows/release.yml

@@ -21,7 +21,7 @@ on:
 
 env:
   COLUMNS: 190
-  CACHE_SEED: SEED-4  # Bump the number to invalidate all caches
+  CACHE_SEED: SEED-1  # Bump the number to invalidate all caches
   RELENV_DATA: "${{ github.workspace }}/.relenv"
   PIP_DISABLE_PIP_VERSION_CHECK: "1"
   RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
@@ -52,6 +52,8 @@ jobs:
       - self-hosted
       - linux
       - repo-release
+    env:
+      USE_S3_CACHE: 'true'
     environment: release
     needs:
       - check-requirements
@@ -125,6 +127,8 @@ jobs:
       - self-hosted
       - linux
       - repo-release
+    env:
+      USE_S3_CACHE: 'true'
     environment: release
     needs:
       - prepare-workflow
@@ -191,6 +195,8 @@ jobs:
       - repo-release
     needs:
       - prepare-workflow
+    env:
+      USE_S3_CACHE: 'true'
     environment: release
     outputs:
       backup-complete: ${{ steps.backup.outputs.backup-complete }}
@@ -220,12 +226,13 @@ jobs:
       - self-hosted
       - linux
       - repo-release
+    env:
+      USE_S3_CACHE: 'true'
     needs:
       - prepare-workflow
       - backup
       - download-onedir-artifact
     environment: release
-
     steps:
       - name: Clone The Salt Repository
         uses: actions/checkout@v4
@@ -275,6 +282,8 @@ jobs:
       - self-hosted
       - linux
       - repo-release
+    env:
+      USE_S3_CACHE: 'true'
     needs:
       - prepare-workflow
       - backup
@@ -389,6 +398,8 @@ jobs:
       - self-hosted
       - linux
       - repo-release
+    env:
+      USE_S3_CACHE: 'true'
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/scheduled.yml

@@ -12,7 +12,7 @@ on:
 
 env:
   COLUMNS: 190
-  CACHE_SEED: SEED-4  # Bump the number to invalidate all caches
+  CACHE_SEED: SEED-1  # Bump the number to invalidate all caches
   RELENV_DATA: "${{ github.workspace }}/.relenv"
   PIP_DISABLE_PIP_VERSION_CHECK: "1"
   RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"

.github/workflows/staging.yml

@@ -37,7 +37,7 @@ on:
 
 env:
   COLUMNS: 190
-  CACHE_SEED: SEED-4  # Bump the number to invalidate all caches
+  CACHE_SEED: SEED-1  # Bump the number to invalidate all caches
   RELENV_DATA: "${{ github.workspace }}/.relenv"
   PIP_DISABLE_PIP_VERSION_CHECK: "1"
   RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
@@ -1873,6 +1873,8 @@ jobs:
       - self-hosted
       - linux
       - repo-staging
+    env:
+      USE_S3_CACHE: 'true'
     needs:
       - prepare-workflow
       - build-source-tarball
@@ -1973,6 +1975,8 @@ jobs:
       - self-hosted
       - linux
       - repo-staging
+    env:
+      USE_S3_CACHE: 'true'
     needs:
       - prepare-workflow
       - build-pkgs-onedir
@@ -2110,6 +2114,8 @@ jobs:
       - self-hosted
       - linux
       - repo-staging
+    env:
+      USE_S3_CACHE: 'true'
     needs:
       - prepare-workflow
       - build-pkgs-onedir
@@ -2300,6 +2306,8 @@ jobs:
       - self-hosted
       - linux
       - repo-staging
+    env:
+      USE_S3_CACHE: 'true'
     needs:
       - prepare-workflow
       - build-pkgs-onedir
@@ -2402,6 +2410,8 @@ jobs:
       - self-hosted
       - linux
       - repo-staging
+    env:
+      USE_S3_CACHE: 'true'
     needs:
       - prepare-workflow
       - build-pkgs-onedir
@@ -2492,6 +2502,8 @@ jobs:
       - self-hosted
       - linux
       - repo-staging
+    env:
+      USE_S3_CACHE: 'true'
     needs:
       - prepare-workflow
       - build-salt-onedir

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

@@ -53,6 +53,8 @@ jobs:
       - self-hosted
       - linux
       - bastion
+    env:
+      USE_S3_CACHE: 'true'
     timeout-minutes: 90
     strategy:
       fail-fast: false
@@ -74,7 +76,7 @@ jobs:
 
       - name: Cache nox.linux.${{ matrix.arch }}.tar.* for session ${{ inputs.nox-session }}
         id: nox-dependencies-cache
-        uses: actions/cache@v3.3.1
+        uses: ./.github/actions/cache
         with:
           path: nox.linux.${{ matrix.arch }}.tar.*
           key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|linux|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ inputs.nox-archive-hash }}
@@ -183,7 +185,7 @@ jobs:
 
       - name: Cache nox.macos.${{ matrix.arch }}.tar.* for session ${{ inputs.nox-session }}
         id: nox-dependencies-cache
-        uses: actions/cache@v3.3.1
+        uses: ./.github/actions/cache
         with:
           path: nox.macos.${{ matrix.arch }}.tar.*
           key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|macos|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ inputs.nox-archive-hash }}
@@ -253,6 +255,8 @@ jobs:
       - self-hosted
       - linux
       - bastion
+    env:
+      USE_S3_CACHE: 'true'
     timeout-minutes: 90
     strategy:
       fail-fast: false
@@ -274,7 +278,7 @@ jobs:
 
       - name: Cache nox.windows.${{ matrix.arch }}.tar.* for session ${{ inputs.nox-session }}
         id: nox-dependencies-cache
-        uses: actions/cache@v3.3.1
+        uses: ./.github/actions/cache
         with:
           path: nox.windows.${{ matrix.arch }}.tar.*
           key: ${{ inputs.cache-prefix }}|testrun-deps|${{ matrix.arch }}|windows|${{ inputs.nox-session }}|${{ inputs.python-version }}|${{ inputs.nox-archive-hash }}

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

@@ -17,6 +17,8 @@
       - self-hosted
       - linux
       - repo-<{ gh_environment }>
+    env:
+      USE_S3_CACHE: 'true'
     needs:
       - prepare-workflow
       <%- if type not in ("src", "onedir") %>

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

@@ -34,7 +34,7 @@ on:
 
 env:
   COLUMNS: 190
-  CACHE_SEED: SEED-4  # Bump the number to invalidate all caches
+  CACHE_SEED: SEED-1  # Bump the number to invalidate all caches
   RELENV_DATA: "${{ github.workspace }}/.relenv"
   PIP_DISABLE_PIP_VERSION_CHECK: "1"
   RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"

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

@@ -74,6 +74,8 @@ permissions:
       - self-hosted
       - linux
       - repo-<{ gh_environment }>
+    env:
+      USE_S3_CACHE: 'true'
     environment: <{ gh_environment }>
     <%- if prepare_workflow_needs %>
     needs:
@@ -157,6 +159,8 @@ permissions:
       - self-hosted
       - linux
       - repo-<{ gh_environment }>
+    env:
+      USE_S3_CACHE: 'true'
     environment: <{ gh_environment }>
     needs:
       - prepare-workflow
@@ -212,6 +216,8 @@ permissions:
       - repo-<{ gh_environment }>
     needs:
       - prepare-workflow
+    env:
+      USE_S3_CACHE: 'true'
     environment: <{ gh_environment }>
     outputs:
       backup-complete: ${{ steps.backup.outputs.backup-complete }}
@@ -242,12 +248,13 @@ permissions:
       - self-hosted
       - linux
       - repo-<{ gh_environment }>
+    env:
+      USE_S3_CACHE: 'true'
     needs:
       - prepare-workflow
       - backup
       - download-onedir-artifact
     environment: <{ gh_environment }>
-
     steps:
       - name: Clone The Salt Repository
         uses: actions/checkout@v4
@@ -282,6 +289,8 @@ permissions:
       - self-hosted
       - linux
       - repo-<{ gh_environment }>
+    env:
+      USE_S3_CACHE: 'true'
     needs:
       - prepare-workflow
       - backup
@@ -396,6 +405,8 @@ permissions:
       - self-hosted
       - linux
       - repo-<{ gh_environment }>
+    env:
+      USE_S3_CACHE: 'true'
     needs:
       - backup
       - release
@@ -437,6 +448,8 @@ permissions:
       - self-hosted
       - linux
       - repo-<{ gh_environment }>
+    env:
+      USE_S3_CACHE: 'true'
     steps:
       - uses: actions/checkout@v4
 

.github/workflows/templates/test-package-downloads-action.yml.jinja

@@ -61,6 +61,8 @@ jobs:
       - self-hosted
       - linux
       - bastion
+    env:
+      USE_S3_CACHE: 'true'
     environment: ${{ inputs.environment }}
     timeout-minutes: 120  # 2 Hours - More than this and something is wrong
     strategy:
@@ -270,6 +272,8 @@ jobs:
   macos:
     name: MacOS
     runs-on: ${{ matrix.distro-slug }}
+    env:
+      USE_S3_CACHE: 'false'
     environment: ${{ inputs.environment }}
     timeout-minutes: 120  # 2 Hours - More than this and something is wrong
     strategy:
@@ -469,6 +473,8 @@ jobs:
 
   windows:
     name: Windows
+    env:
+      USE_S3_CACHE: 'true'
     runs-on:
       - self-hosted
       - linux

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

@@ -61,6 +61,8 @@ jobs:
       - self-hosted
       - linux
       - bastion
+    env:
+      USE_S3_CACHE: 'true'
     environment: ${{ inputs.environment }}
     timeout-minutes: 120  # 2 Hours - More than this and something is wrong
     strategy:
@@ -379,6 +381,8 @@ jobs:
   macos:
     name: MacOS
     runs-on: ${{ matrix.distro-slug }}
+    env:
+      USE_S3_CACHE: 'false'
     environment: ${{ inputs.environment }}
     timeout-minutes: 120  # 2 Hours - More than this and something is wrong
     strategy:
@@ -585,6 +589,8 @@ jobs:
 
   windows:
     name: Windows
+    env:
+      USE_S3_CACHE: 'true'
     runs-on:
       - self-hosted
       - linux

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

@@ -69,6 +69,7 @@ env:
   PIP_EXTRA_INDEX_URL: https://pypi.org/simple
   PIP_DISABLE_PIP_VERSION_CHECK: "1"
   RAISE_DEPRECATIONS_RUNTIME_ERRORS: "1"
+  USE_S3_CACHE: 'true'
 
 jobs:
 

tests/conftest.py

@@ -448,6 +448,7 @@ def pytest_collection_modifyitems(config, items):
     groups_collection_modifyitems(config, items)
     from_filenames_collection_modifyitems(config, items)
 
+    log.warning("Modifying collected tests to keep track of fixture usage")
     timeout_marker_tests_paths = (
         str(PYTESTS_DIR / "pkg"),
         str(PYTESTS_DIR / "scenarios"),