Merge 3007.x into master

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

@@ -307,6 +307,11 @@ jobs:
       - name: Checkout Source Code
         uses: actions/checkout@v4
 
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
+
       - name: Merge JUnit XML Test Run Artifacts
         uses: actions/upload-artifact/merge@v4
         with:

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

@@ -335,6 +335,11 @@ jobs:
       - name: Checkout Source Code
         uses: actions/checkout@v4
 
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
+
       - name: Merge JUnit XML Test Run Artifacts
         uses: actions/upload-artifact/merge@v4
         with:

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

@@ -308,6 +308,11 @@ jobs:
       - name: Checkout Source Code
         uses: actions/checkout@v4
 
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
+
       - name: Merge JUnit XML Test Run Artifacts
         uses: actions/upload-artifact/merge@v4
         with:

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

@@ -239,6 +239,11 @@ jobs:
       - name: Checkout Source Code
         uses: actions/checkout@v4
 
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
+
       - name: Merge Test Run Artifacts
         uses: actions/upload-artifact/merge@v4
         with:

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

@@ -222,6 +222,11 @@ jobs:
       - name: Checkout Source Code
         uses: actions/checkout@v4
 
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
+
       - name: Merge Test Run Artifacts
         uses: actions/upload-artifact/merge@v4
         with:

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

@@ -238,6 +238,11 @@ jobs:
       - name: Checkout Source Code
         uses: actions/checkout@v4
 
+      - name: "Throttle Builds"
+        shell: bash
+        run: |
+          t=$(shuf -i 1-30 -n 1); echo "Sleeping $t seconds"; sleep "$t"
+
       - name: Merge Test Run Artifacts
         uses: actions/upload-artifact/merge@v4
         with:

tests/pytests/functional/modules/test_pkg.py

@@ -230,7 +230,7 @@ def test_owner(modules, grains):
 # Similar to pkg.owner, but for FreeBSD's pkgng
 @pytest.mark.skip_on_freebsd(reason="test for new package manager for FreeBSD")
 @pytest.mark.requires_salt_modules("pkg.which")
-def test_which(grains, modules):
+def test_which(modules, grains):
     """
     test finding the package owning a file
     """