Merge pull request saltstack#66520 from s0undt3ch/hotfix/merge-forwar…

…d-into-master [master] Merge 3007.x into master
jynolen · May 16, 2024 · fe47a95 · fe47a95
2 parents 1e91416 + 7835f3a
commit fe47a95
Show file tree

Hide file tree

Showing 46 changed files with 1,506 additions and 606 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -1008,7 +1008,7 @@ jobs:
 
   ubuntu-2204-arm64-pkg-tests:
     name: Ubuntu 22.04 Arm64 Package Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'ubuntu-22.04-arm64') }}
     needs:
       - prepare-workflow
       - build-pkgs-onedir
@@ -1027,6 +1027,48 @@ jobs:
       skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
+  ubuntu-2404-pkg-tests:
+    name: Ubuntu 24.04 Package Test
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'ubuntu-24.04') }}
+    needs:
+      - prepare-workflow
+      - build-pkgs-onedir
+      - build-ci-deps
+    uses: ./.github/workflows/test-packages-action-linux.yml
+    with:
+      distro-slug: ubuntu-24.04
+      nox-session: ci-test-onedir
+      platform: linux
+      arch: x86_64
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      pkg-type: deb
+      nox-version: 2022.8.7
+      python-version: "3.10"
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
+      skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
+      testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
+
+  ubuntu-2404-arm64-pkg-tests:
+    name: Ubuntu 24.04 Arm64 Package Test
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-pkgs-onedir
+      - build-ci-deps
+    uses: ./.github/workflows/test-packages-action-linux.yml
+    with:
+      distro-slug: ubuntu-24.04-arm64
+      nox-session: ci-test-onedir
+      platform: linux
+      arch: arm64
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      pkg-type: deb
+      nox-version: 2022.8.7
+      python-version: "3.10"
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
+      skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
+      testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
+
   macos-12-pkg-tests:
     name: macOS 12 Package Test
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
@@ -1642,15 +1684,15 @@ jobs:
       workflow-slug: ci
       timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
 
-  fedora-39:
-    name: Fedora 39 Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'fedora-39') }}
+  fedora-40:
+    name: Fedora 40 Test
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'fedora-40') }}
     needs:
       - prepare-workflow
       - build-ci-deps
     uses: ./.github/workflows/test-action-linux.yml
     with:
-      distro-slug: fedora-39
+      distro-slug: fedora-40
       nox-session: ci-test-onedir
       platform: linux
       arch: x86_64
@@ -1921,7 +1963,7 @@ jobs:
 
   ubuntu-2204-arm64:
     name: Ubuntu 22.04 Arm64 Test
-    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'ubuntu-22.04-arm64') }}
     needs:
       - prepare-workflow
       - build-ci-deps
@@ -1940,6 +1982,48 @@ jobs:
       workflow-slug: ci
       timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
 
+  ubuntu-2404:
+    name: Ubuntu 24.04 Test
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] && contains(fromJSON(needs.prepare-workflow.outputs.os-labels), 'ubuntu-24.04') }}
+    needs:
+      - prepare-workflow
+      - build-ci-deps
+    uses: ./.github/workflows/test-action-linux.yml
+    with:
+      distro-slug: ubuntu-24.04
+      nox-session: ci-test-onedir
+      platform: linux
+      arch: x86_64
+      nox-version: 2022.8.7
+      gh-actions-python-version: "3.10"
+      testrun: ${{ needs.prepare-workflow.outputs.testrun }}
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
+      skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
+      workflow-slug: ci
+      timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
+
+  ubuntu-2404-arm64:
+    name: Ubuntu 24.04 Arm64 Test
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-ci-deps
+    uses: ./.github/workflows/test-action-linux.yml
+    with:
+      distro-slug: ubuntu-24.04-arm64
+      nox-session: ci-test-onedir
+      platform: linux
+      arch: arm64
+      nox-version: 2022.8.7
+      gh-actions-python-version: "3.10"
+      testrun: ${{ needs.prepare-workflow.outputs.testrun }}
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
+      skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }}
+      workflow-slug: ci
+      timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
+
   combine-all-code-coverage:
     name: Combine Code Coverage
     if: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] == false }}
@@ -1967,7 +2051,7 @@ jobs:
       - debian-11-arm64
       - debian-12
       - debian-12-arm64
-      - fedora-39
+      - fedora-40
       - opensuse-15
       - photonos-4
       - photonos-4-arm64
@@ -1981,6 +2065,8 @@ jobs:
       - ubuntu-2004-arm64
       - ubuntu-2204
       - ubuntu-2204-arm64
+      - ubuntu-2404
+      - ubuntu-2404-arm64
     steps:
       - uses: actions/checkout@v4
 
@@ -2133,7 +2219,7 @@ jobs:
       - debian-11-arm64
       - debian-12
       - debian-12-arm64
-      - fedora-39
+      - fedora-40
       - opensuse-15
       - photonos-4
       - photonos-4-arm64
@@ -2147,6 +2233,8 @@ jobs:
       - ubuntu-2004-arm64
       - ubuntu-2204
       - ubuntu-2204-arm64
+      - ubuntu-2404
+      - ubuntu-2404-arm64
       - rockylinux-8-pkg-tests
       - rockylinux-8-arm64-pkg-tests
       - rockylinux-9-pkg-tests
@@ -2172,6 +2260,8 @@ jobs:
       - ubuntu-2004-arm64-pkg-tests
       - ubuntu-2204-pkg-tests
       - ubuntu-2204-arm64-pkg-tests
+      - ubuntu-2404-pkg-tests
+      - ubuntu-2404-arm64-pkg-tests
       - macos-12-pkg-tests
       - macos-13-pkg-tests
       - macos-13-arm64-pkg-tests

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
@@ -1092,6 +1092,48 @@ jobs:
       skip-code-coverage: false
       testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
 
+  ubuntu-2404-pkg-tests:
+    name: Ubuntu 24.04 Package Test
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-pkgs-onedir
+      - build-ci-deps
+    uses: ./.github/workflows/test-packages-action-linux.yml
+    with:
+      distro-slug: ubuntu-24.04
+      nox-session: ci-test-onedir
+      platform: linux
+      arch: x86_64
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      pkg-type: deb
+      nox-version: 2022.8.7
+      python-version: "3.10"
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
+      skip-code-coverage: false
+      testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
+
+  ubuntu-2404-arm64-pkg-tests:
+    name: Ubuntu 24.04 Arm64 Package Test
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-pkgs-onedir
+      - build-ci-deps
+    uses: ./.github/workflows/test-packages-action-linux.yml
+    with:
+      distro-slug: ubuntu-24.04-arm64
+      nox-session: ci-test-onedir
+      platform: linux
+      arch: arm64
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      pkg-type: deb
+      nox-version: 2022.8.7
+      python-version: "3.10"
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
+      skip-code-coverage: false
+      testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }}
+
   macos-12-pkg-tests:
     name: macOS 12 Package Test
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['github-hosted'] }}
@@ -1707,15 +1749,15 @@ jobs:
       workflow-slug: nightly
       timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
 
-  fedora-39:
-    name: Fedora 39 Test
+  fedora-40:
+    name: Fedora 40 Test
     if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
     needs:
       - prepare-workflow
       - build-ci-deps
     uses: ./.github/workflows/test-action-linux.yml
     with:
-      distro-slug: fedora-39
+      distro-slug: fedora-40
       nox-session: ci-test-onedir
       platform: linux
       arch: x86_64
@@ -2005,6 +2047,48 @@ jobs:
       workflow-slug: nightly
       timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
 
+  ubuntu-2404:
+    name: Ubuntu 24.04 Test
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-ci-deps
+    uses: ./.github/workflows/test-action-linux.yml
+    with:
+      distro-slug: ubuntu-24.04
+      nox-session: ci-test-onedir
+      platform: linux
+      arch: x86_64
+      nox-version: 2022.8.7
+      gh-actions-python-version: "3.10"
+      testrun: ${{ needs.prepare-workflow.outputs.testrun }}
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
+      skip-code-coverage: false
+      workflow-slug: nightly
+      timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
+
+  ubuntu-2404-arm64:
+    name: Ubuntu 24.04 Arm64 Test
+    if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }}
+    needs:
+      - prepare-workflow
+      - build-ci-deps
+    uses: ./.github/workflows/test-action-linux.yml
+    with:
+      distro-slug: ubuntu-24.04-arm64
+      nox-session: ci-test-onedir
+      platform: linux
+      arch: arm64
+      nox-version: 2022.8.7
+      gh-actions-python-version: "3.10"
+      testrun: ${{ needs.prepare-workflow.outputs.testrun }}
+      salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}"
+      cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.14
+      skip-code-coverage: false
+      workflow-slug: nightly
+      timeout-minutes: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['type'] == 'full' && 180 || 360 }}
+
   combine-all-code-coverage:
     name: Combine Code Coverage
     if: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] == false }}
@@ -2032,7 +2116,7 @@ jobs:
       - debian-11-arm64
       - debian-12
       - debian-12-arm64
-      - fedora-39
+      - fedora-40
       - opensuse-15
       - photonos-4
       - photonos-4-arm64
@@ -2046,6 +2130,8 @@ jobs:
       - ubuntu-2004-arm64
       - ubuntu-2204
       - ubuntu-2204-arm64
+      - ubuntu-2404
+      - ubuntu-2404-arm64
     steps:
       - uses: actions/checkout@v4
 
@@ -2315,11 +2401,11 @@ jobs:
             arch: arm64
           - pkg-type: deb
             distro: ubuntu
-            version: "23.04"
+            version: "24.04"
             arch: x86_64
           - pkg-type: deb
             distro: ubuntu
-            version: "23.04"
+            version: "24.04"
             arch: arm64
 
     steps:
@@ -2438,15 +2524,15 @@ jobs:
             arch: aarch64
           - pkg-type: rpm
             distro: fedora
-            version: "39"
+            version: "40"
             arch: x86_64
           - pkg-type: rpm
             distro: fedora
-            version: "39"
+            version: "40"
             arch: arm64
           - pkg-type: rpm
             distro: fedora
-            version: "39"
+            version: "40"
             arch: aarch64
           - pkg-type: rpm
             distro: photon
@@ -2950,7 +3036,7 @@ jobs:
       - debian-11-arm64
       - debian-12
       - debian-12-arm64
-      - fedora-39
+      - fedora-40
       - opensuse-15
       - photonos-4
       - photonos-4-arm64
@@ -2964,6 +3050,8 @@ jobs:
       - ubuntu-2004-arm64
       - ubuntu-2204
       - ubuntu-2204-arm64
+      - ubuntu-2404
+      - ubuntu-2404-arm64
 
     steps:
 
@@ -3047,6 +3135,8 @@ jobs:
       - ubuntu-2004-arm64-pkg-tests
       - ubuntu-2204-pkg-tests
       - ubuntu-2204-arm64-pkg-tests
+      - ubuntu-2404-pkg-tests
+      - ubuntu-2404-arm64-pkg-tests
       - macos-12-pkg-tests
       - macos-13-pkg-tests
       - macos-13-arm64-pkg-tests