Add Fedora 40 and Ubuntu 24.04 support

.github/workflows/ci.yml

@@ -987,7 +987,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
@@ -1006,6 +1006,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'] }}
@@ -1621,15 +1663,15 @@ jobs:
       workflow-slug: ci
       default-timeout: 180
 
-  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
@@ -1900,7 +1942,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
@@ -1919,6 +1961,48 @@ jobs:
       workflow-slug: ci
       default-timeout: 180
 
+  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
+      default-timeout: 180
+
+  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
+      default-timeout: 180
+
   combine-all-code-coverage:
     name: Combine Code Coverage
     if: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] == false }}
@@ -1946,7 +2030,7 @@ jobs:
       - debian-11-arm64
       - debian-12
       - debian-12-arm64
-      - fedora-39
+      - fedora-40
       - opensuse-15
       - photonos-4
       - photonos-4-arm64
@@ -1960,6 +2044,8 @@ jobs:
       - ubuntu-2004-arm64
       - ubuntu-2204
       - ubuntu-2204-arm64
+      - ubuntu-2404
+      - ubuntu-2404-arm64
     steps:
       - uses: actions/checkout@v4
 
@@ -2112,7 +2198,7 @@ jobs:
       - debian-11-arm64
       - debian-12
       - debian-12-arm64
-      - fedora-39
+      - fedora-40
       - opensuse-15
       - photonos-4
       - photonos-4-arm64
@@ -2126,6 +2212,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
@@ -2151,6 +2239,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

.github/workflows/nightly.yml

@@ -1068,6 +1068,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'] }}
@@ -1683,15 +1725,15 @@ jobs:
       workflow-slug: nightly
       default-timeout: 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
@@ -1981,6 +2023,48 @@ jobs:
       workflow-slug: nightly
       default-timeout: 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
+      default-timeout: 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
+      default-timeout: 360
+
   combine-all-code-coverage:
     name: Combine Code Coverage
     if: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] == false }}
@@ -2008,7 +2092,7 @@ jobs:
       - debian-11-arm64
       - debian-12
       - debian-12-arm64
-      - fedora-39
+      - fedora-40
       - opensuse-15
       - photonos-4
       - photonos-4-arm64
@@ -2022,6 +2106,8 @@ jobs:
       - ubuntu-2004-arm64
       - ubuntu-2204
       - ubuntu-2204-arm64
+      - ubuntu-2404
+      - ubuntu-2404-arm64
     steps:
       - uses: actions/checkout@v4
 
@@ -2291,11 +2377,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:
@@ -2414,15 +2500,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
@@ -2926,7 +3012,7 @@ jobs:
       - debian-11-arm64
       - debian-12
       - debian-12-arm64
-      - fedora-39
+      - fedora-40
       - opensuse-15
       - photonos-4
       - photonos-4-arm64
@@ -2940,6 +3026,8 @@ jobs:
       - ubuntu-2004-arm64
       - ubuntu-2204
       - ubuntu-2204-arm64
+      - ubuntu-2404
+      - ubuntu-2404-arm64
 
     steps:
 
@@ -3023,6 +3111,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

.github/workflows/scheduled.yml

@@ -1045,6 +1045,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'] }}
@@ -1660,15 +1702,15 @@ jobs:
       workflow-slug: scheduled
       default-timeout: 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
@@ -1958,6 +2000,48 @@ jobs:
       workflow-slug: scheduled
       default-timeout: 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: scheduled
+      default-timeout: 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: scheduled
+      default-timeout: 360
+
   combine-all-code-coverage:
     name: Combine Code Coverage
     if: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] == false }}
@@ -1985,7 +2069,7 @@ jobs:
       - debian-11-arm64
       - debian-12
       - debian-12-arm64
-      - fedora-39
+      - fedora-40
       - opensuse-15
       - photonos-4
       - photonos-4-arm64
@@ -1999,6 +2083,8 @@ jobs:
       - ubuntu-2004-arm64
       - ubuntu-2204
       - ubuntu-2204-arm64
+      - ubuntu-2404
+      - ubuntu-2404-arm64
     steps:
       - uses: actions/checkout@v4
 
@@ -2153,7 +2239,7 @@ jobs:
       - debian-11-arm64
       - debian-12
       - debian-12-arm64
-      - fedora-39
+      - fedora-40
       - opensuse-15
       - photonos-4
       - photonos-4-arm64
@@ -2167,6 +2253,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
@@ -2192,6 +2280,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

.github/workflows/staging.yml

@@ -1053,6 +1053,48 @@ jobs:
       skip-code-coverage: true
       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: true
+      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: true
+      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'] }}
@@ -1668,15 +1710,15 @@ jobs:
       workflow-slug: staging
       default-timeout: 180
 
-  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
@@ -1966,6 +2008,48 @@ jobs:
       workflow-slug: staging
       default-timeout: 180
 
+  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: true
+      workflow-slug: staging
+      default-timeout: 180
+
+  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: true
+      workflow-slug: staging
+      default-timeout: 180
+
   build-src-repo:
     name: Build Repository
     environment: staging
@@ -2119,11 +2203,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:
@@ -2242,15 +2326,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
@@ -2888,7 +2972,7 @@ jobs:
       - debian-11-arm64
       - debian-12
       - debian-12-arm64
-      - fedora-39
+      - fedora-40
       - opensuse-15
       - photonos-4
       - photonos-4-arm64
@@ -2902,6 +2986,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
@@ -2927,6 +3013,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

changelog/66180.added.md

@@ -0,0 +1 @@
+Add Ubuntu 24.04 support

changelog/66300.added.md

@@ -0,0 +1 @@
+Add Fedora 40 support, replacing Fedora 39

cicd/golden-images.json

@@ -1,8 +1,8 @@
 {
   "amazonlinux-2-arm64": {
-    "ami": "ami-0fa1d515b17aa5832",
+    "ami": "ami-0c98c023fba59d522",
     "ami_description": "CI Image of AmazonLinux 2 arm64",
-    "ami_name": "salt-project/ci/amazonlinux/2/arm64/20240325.2133",
+    "ami_name": "salt-project/ci/amazonlinux/2/arm64/20240509.1530",
     "arch": "arm64",
     "cloudwatch-agent-available": "true",
     "instance_type": "m6g.large",
@@ -10,9 +10,9 @@
     "ssh_username": "ec2-user"
   },
   "amazonlinux-2": {
-    "ami": "ami-0c9a41917d788911e",
+    "ami": "ami-02cba95cfd7074794",
     "ami_description": "CI Image of AmazonLinux 2 x86_64",
-    "ami_name": "salt-project/ci/amazonlinux/2/x86_64/20240325.2133",
+    "ami_name": "salt-project/ci/amazonlinux/2/x86_64/20240509.1530",
     "arch": "x86_64",
     "cloudwatch-agent-available": "true",
     "instance_type": "t3a.large",
@@ -20,9 +20,9 @@
     "ssh_username": "ec2-user"
   },
   "amazonlinux-2023-arm64": {
-    "ami": "ami-00644e6cc81cb8fc0",
+    "ami": "ami-0609f0e98f5a6b73d",
     "ami_description": "CI Image of AmazonLinux 2023 arm64",
-    "ami_name": "salt-project/ci/amazonlinux/2023/arm64/20240325.2133",
+    "ami_name": "salt-project/ci/amazonlinux/2023/arm64/20240509.1529",
     "arch": "arm64",
     "cloudwatch-agent-available": "true",
     "instance_type": "m6g.large",
@@ -30,9 +30,9 @@
     "ssh_username": "ec2-user"
   },
   "amazonlinux-2023": {
-    "ami": "ami-01ba1cac2a9ba4845",
+    "ami": "ami-0554a801eb6dcc42c",
     "ami_description": "CI Image of AmazonLinux 2023 x86_64",
-    "ami_name": "salt-project/ci/amazonlinux/2023/x86_64/20240325.2133",
+    "ami_name": "salt-project/ci/amazonlinux/2023/x86_64/20240509.1529",
     "arch": "x86_64",
     "cloudwatch-agent-available": "true",
     "instance_type": "t3a.large",
@@ -40,9 +40,9 @@
     "ssh_username": "ec2-user"
   },
   "archlinux-lts": {
-    "ami": "ami-01f729941d3262787",
+    "ami": "ami-01ad78f19930b9747",
     "ami_description": "CI Image of ArchLinux lts x86_64",
-    "ami_name": "salt-project/ci/archlinux/lts/x86_64/20240209.1843",
+    "ami_name": "salt-project/ci/archlinux/lts/x86_64/20240509.1530",
     "arch": "x86_64",
     "cloudwatch-agent-available": "false",
     "instance_type": "t3a.large",
@@ -50,9 +50,9 @@
     "ssh_username": "arch"
   },
   "centos-7-arm64": {
-    "ami": "ami-0a0c4ce5d61416643",
+    "ami": "ami-0ef52419c91cb0169",
     "ami_description": "CI Image of CentOS 7 arm64",
-    "ami_name": "salt-project/ci/centos/7/arm64/20240325.2134",
+    "ami_name": "salt-project/ci/centos/7/arm64/20240509.1530",
     "arch": "arm64",
     "cloudwatch-agent-available": "true",
     "instance_type": "m6g.large",
@@ -60,9 +60,9 @@
     "ssh_username": "centos"
   },
   "centos-7": {
-    "ami": "ami-06fec7a8fe157fe7d",
+    "ami": "ami-0973c8d1b91dcba5c",
     "ami_description": "CI Image of CentOS 7 x86_64",
-    "ami_name": "salt-project/ci/centos/7/x86_64/20240325.2134",
+    "ami_name": "salt-project/ci/centos/7/x86_64/20240509.1530",
     "arch": "x86_64",
     "cloudwatch-agent-available": "true",
     "instance_type": "t3a.large",
@@ -70,9 +70,9 @@
     "ssh_username": "centos"
   },
   "debian-11-arm64": {
-    "ami": "ami-0e1d6f34aaeba1e58",
+    "ami": "ami-0eff227d9a94d8692",
     "ami_description": "CI Image of Debian 11 arm64",
-    "ami_name": "salt-project/ci/debian/11/arm64/20240325.2134",
+    "ami_name": "salt-project/ci/debian/11/arm64/20240509.1529",
     "arch": "arm64",
     "cloudwatch-agent-available": "false",
     "instance_type": "m6g.large",
@@ -80,9 +80,9 @@
     "ssh_username": "admin"
   },
   "debian-11": {
-    "ami": "ami-012327dae48ce80ac",
+    "ami": "ami-099b2a5a1fb995166",
     "ami_description": "CI Image of Debian 11 x86_64",
-    "ami_name": "salt-project/ci/debian/11/x86_64/20240325.2134",
+    "ami_name": "salt-project/ci/debian/11/x86_64/20240509.1529",
     "arch": "x86_64",
     "cloudwatch-agent-available": "true",
     "instance_type": "t3a.large",
@@ -90,9 +90,9 @@
     "ssh_username": "admin"
   },
   "debian-12-arm64": {
-    "ami": "ami-0527ef47cece68f54",
+    "ami": "ami-0ab6b0cc8488f8880",
     "ami_description": "CI Image of Debian 12 arm64",
-    "ami_name": "salt-project/ci/debian/12/arm64/20240325.2134",
+    "ami_name": "salt-project/ci/debian/12/arm64/20240509.1529",
     "arch": "arm64",
     "cloudwatch-agent-available": "false",
     "instance_type": "m6g.large",
@@ -100,29 +100,29 @@
     "ssh_username": "admin"
   },
   "debian-12": {
-    "ami": "ami-0d9d685ae10656958",
+    "ami": "ami-0e1f5b55325249c4e",
     "ami_description": "CI Image of Debian 12 x86_64",
-    "ami_name": "salt-project/ci/debian/12/x86_64/20240325.2134",
+    "ami_name": "salt-project/ci/debian/12/x86_64/20240509.1530",
     "arch": "x86_64",
     "cloudwatch-agent-available": "true",
     "instance_type": "t3a.large",
     "is_windows": "false",
     "ssh_username": "admin"
   },
-  "fedora-39-arm64": {
-    "ami": "ami-00d2f2e1fccac457d",
-    "ami_description": "CI Image of Fedora 39 arm64",
-    "ami_name": "salt-project/ci/fedora/39/arm64/20240325.2133",
+  "fedora-40-arm64": {
+    "ami": "ami-064df327a55f83953",
+    "ami_description": "CI Image of Fedora 40 arm64",
+    "ami_name": "salt-project/ci/fedora/40/arm64/20240509.1530",
     "arch": "arm64",
     "cloudwatch-agent-available": "true",
     "instance_type": "m6g.large",
     "is_windows": "false",
     "ssh_username": "fedora"
   },
-  "fedora-39": {
-    "ami": "ami-072c01a40a6519153",
-    "ami_description": "CI Image of Fedora 39 x86_64",
-    "ami_name": "salt-project/ci/fedora/39/x86_64/20240325.2133",
+  "fedora-40": {
+    "ami": "ami-08d8dbd4f063788de",
+    "ami_description": "CI Image of Fedora 40 x86_64",
+    "ami_name": "salt-project/ci/fedora/40/x86_64/20240509.1530",
     "arch": "x86_64",
     "cloudwatch-agent-available": "true",
     "instance_type": "t3a.large",
@@ -130,9 +130,9 @@
     "ssh_username": "fedora"
   },
   "opensuse-15": {
-    "ami": "ami-04cfbfd3c214348bc",
+    "ami": "ami-0f82d5ab3015af6ad",
     "ami_description": "CI Image of Opensuse 15 x86_64",
-    "ami_name": "salt-project/ci/opensuse/15/x86_64/20240325.2133",
+    "ami_name": "salt-project/ci/opensuse/15/x86_64/20240509.1529",
     "arch": "x86_64",
     "cloudwatch-agent-available": "true",
     "instance_type": "t3a.large",
@@ -140,9 +140,9 @@
     "ssh_username": "ec2-user"
   },
   "photonos-4-arm64": {
-    "ami": "ami-0bd76e6234ee685a7",
+    "ami": "ami-0ea152c346cb8e13b",
     "ami_description": "CI Image of PhotonOS 4 arm64",
-    "ami_name": "salt-project/ci/photonos/4/arm64/20240325.2133",
+    "ami_name": "salt-project/ci/photonos/4/arm64/20240509.1530",
     "arch": "arm64",
     "cloudwatch-agent-available": "true",
     "instance_type": "m6g.large",
@@ -150,9 +150,9 @@
     "ssh_username": "root"
   },
   "photonos-4": {
-    "ami": "ami-0b1947785de4b2a6e",
+    "ami": "ami-09b55d0bf3a1aa7e5",
     "ami_description": "CI Image of PhotonOS 4 x86_64",
-    "ami_name": "salt-project/ci/photonos/4/x86_64/20240325.2134",
+    "ami_name": "salt-project/ci/photonos/4/x86_64/20240509.1530",
     "arch": "x86_64",
     "cloudwatch-agent-available": "true",
     "instance_type": "t3a.large",
@@ -160,9 +160,9 @@
     "ssh_username": "root"
   },
   "photonos-5-arm64": {
-    "ami": "ami-0d02f34b9820752e4",
+    "ami": "ami-09de4952bc9fc068a",
     "ami_description": "CI Image of PhotonOS 5 arm64",
-    "ami_name": "salt-project/ci/photonos/5/arm64/20240325.2133",
+    "ami_name": "salt-project/ci/photonos/5/arm64/20240509.1530",
     "arch": "arm64",
     "cloudwatch-agent-available": "true",
     "instance_type": "m6g.large",
@@ -170,9 +170,9 @@
     "ssh_username": "root"
   },
   "photonos-5": {
-    "ami": "ami-0fd58f07139e9622e",
+    "ami": "ami-0c3375a583643fc77",
     "ami_description": "CI Image of PhotonOS 5 x86_64",
-    "ami_name": "salt-project/ci/photonos/5/x86_64/20240325.2134",
+    "ami_name": "salt-project/ci/photonos/5/x86_64/20240509.1530",
     "arch": "x86_64",
     "cloudwatch-agent-available": "true",
     "instance_type": "t3a.large",
@@ -180,9 +180,9 @@
     "ssh_username": "root"
   },
   "rockylinux-8-arm64": {
-    "ami": "ami-0e5d23f57141e5ac4",
+    "ami": "ami-0662cc201cada14b8",
     "ami_description": "CI Image of RockyLinux 8 arm64",
-    "ami_name": "salt-project/ci/rockylinux/8/arm64/20240325.2134",
+    "ami_name": "salt-project/ci/rockylinux/8/arm64/20240509.1530",
     "arch": "arm64",
     "cloudwatch-agent-available": "true",
     "instance_type": "m6g.large",
@@ -190,9 +190,9 @@
     "ssh_username": "rocky"
   },
   "rockylinux-8": {
-    "ami": "ami-0e2cac6a847d700aa",
+    "ami": "ami-071ca70a907d79e05",
     "ami_description": "CI Image of RockyLinux 8 x86_64",
-    "ami_name": "salt-project/ci/rockylinux/8/x86_64/20240325.2134",
+    "ami_name": "salt-project/ci/rockylinux/8/x86_64/20240509.1530",
     "arch": "x86_64",
     "cloudwatch-agent-available": "true",
     "instance_type": "t3a.large",
@@ -200,9 +200,9 @@
     "ssh_username": "rocky"
   },
   "rockylinux-9-arm64": {
-    "ami": "ami-0054d3b25a08d2b41",
+    "ami": "ami-065842dfdf03a1a03",
     "ami_description": "CI Image of RockyLinux 9 arm64",
-    "ami_name": "salt-project/ci/rockylinux/9/arm64/20240325.2134",
+    "ami_name": "salt-project/ci/rockylinux/9/arm64/20240509.1530",
     "arch": "arm64",
     "cloudwatch-agent-available": "true",
     "instance_type": "m6g.large",
@@ -210,9 +210,9 @@
     "ssh_username": "rocky"
   },
   "rockylinux-9": {
-    "ami": "ami-042d3b81138968bdb",
+    "ami": "ami-09f5d6df00e99ba16",
     "ami_description": "CI Image of RockyLinux 9 x86_64",
-    "ami_name": "salt-project/ci/rockylinux/9/x86_64/20240325.2134",
+    "ami_name": "salt-project/ci/rockylinux/9/x86_64/20240509.1530",
     "arch": "x86_64",
     "cloudwatch-agent-available": "true",
     "instance_type": "t3a.large",
@@ -220,9 +220,9 @@
     "ssh_username": "rocky"
   },
   "ubuntu-20.04-arm64": {
-    "ami": "ami-0bd2e3ee99c5a2f52",
+    "ami": "ami-00171fa604b826054",
     "ami_description": "CI Image of Ubuntu 20.04 arm64",
-    "ami_name": "salt-project/ci/ubuntu/20.04/arm64/20240325.2134",
+    "ami_name": "salt-project/ci/ubuntu/20.04/arm64/20240509.1530",
     "arch": "arm64",
     "cloudwatch-agent-available": "true",
     "instance_type": "m6g.large",
@@ -230,9 +230,9 @@
     "ssh_username": "ubuntu"
   },
   "ubuntu-20.04": {
-    "ami": "ami-0fdc19cb94bc96db3",
+    "ami": "ami-07ddfbdc489064022",
     "ami_description": "CI Image of Ubuntu 20.04 x86_64",
-    "ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20240325.2134",
+    "ami_name": "salt-project/ci/ubuntu/20.04/x86_64/20240509.1530",
     "arch": "x86_64",
     "cloudwatch-agent-available": "true",
     "instance_type": "t3a.large",
@@ -240,9 +240,9 @@
     "ssh_username": "ubuntu"
   },
   "ubuntu-22.04-arm64": {
-    "ami": "ami-0690e86bc116a6245",
+    "ami": "ami-0e6b6fc1dd298e055",
     "ami_description": "CI Image of Ubuntu 22.04 arm64",
-    "ami_name": "salt-project/ci/ubuntu/22.04/arm64/20240325.2134",
+    "ami_name": "salt-project/ci/ubuntu/22.04/arm64/20240509.1530",
     "arch": "arm64",
     "cloudwatch-agent-available": "true",
     "instance_type": "m6g.large",
@@ -250,29 +250,29 @@
     "ssh_username": "ubuntu"
   },
   "ubuntu-22.04": {
-    "ami": "ami-0285c21e3abc8b2b2",
+    "ami": "ami-0736289579c0d01ba",
     "ami_description": "CI Image of Ubuntu 22.04 x86_64",
-    "ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20240325.2134",
+    "ami_name": "salt-project/ci/ubuntu/22.04/x86_64/20240509.1530",
     "arch": "x86_64",
     "cloudwatch-agent-available": "true",
     "instance_type": "t3a.large",
     "is_windows": "false",
     "ssh_username": "ubuntu"
   },
-  "ubuntu-23.04-arm64": {
-    "ami": "ami-09e0eb04bbf2a2f35",
-    "ami_description": "CI Image of Ubuntu 23.04 arm64",
-    "ami_name": "salt-project/ci/ubuntu/23.04/arm64/20240325.2134",
+  "ubuntu-24.04-arm64": {
+    "ami": "ami-015058823f69446b3",
+    "ami_description": "CI Image of Ubuntu 24.04 arm64",
+    "ami_name": "salt-project/ci/ubuntu/24.04/arm64/20240509.1530",
     "arch": "arm64",
     "cloudwatch-agent-available": "true",
     "instance_type": "m6g.large",
     "is_windows": "false",
     "ssh_username": "ubuntu"
   },
-  "ubuntu-23.04": {
-    "ami": "ami-029edca569b26d625",
-    "ami_description": "CI Image of Ubuntu 23.04 x86_64",
-    "ami_name": "salt-project/ci/ubuntu/23.04/x86_64/20240325.2134",
+  "ubuntu-24.04": {
+    "ami": "ami-0eb04152e7cafaaf9",
+    "ami_description": "CI Image of Ubuntu 24.04 x86_64",
+    "ami_name": "salt-project/ci/ubuntu/24.04/x86_64/20240509.1530",
     "arch": "x86_64",
     "cloudwatch-agent-available": "true",
     "instance_type": "t3a.large",
@@ -280,9 +280,9 @@
     "ssh_username": "ubuntu"
   },
   "windows-2016": {
-    "ami": "ami-0474d8e7e13c81883",
+    "ami": "ami-06026cb4d83072df5",
     "ami_description": "CI Image of Windows 2016 x86_64",
-    "ami_name": "salt-project/ci/windows/2016/x86_64/20240325.2133",
+    "ami_name": "salt-project/ci/windows/2016/x86_64/20240509.1530",
     "arch": "x86_64",
     "cloudwatch-agent-available": "true",
     "instance_type": "t3a.xlarge",
@@ -290,9 +290,9 @@
     "ssh_username": "Administrator"
   },
   "windows-2019": {
-    "ami": "ami-07afee87d071123bf",
+    "ami": "ami-095a9256ec0e8261c",
     "ami_description": "CI Image of Windows 2019 x86_64",
-    "ami_name": "salt-project/ci/windows/2019/x86_64/20240325.2133",
+    "ami_name": "salt-project/ci/windows/2019/x86_64/20240509.1530",
     "arch": "x86_64",
     "cloudwatch-agent-available": "true",
     "instance_type": "t3a.xlarge",
@@ -300,9 +300,9 @@
     "ssh_username": "Administrator"
   },
   "windows-2022": {
-    "ami": "ami-08f69046343f92cc4",
+    "ami": "ami-0d295c0711e513c05",
     "ami_description": "CI Image of Windows 2022 x86_64",
-    "ami_name": "salt-project/ci/windows/2022/x86_64/20240325.2133",
+    "ami_name": "salt-project/ci/windows/2022/x86_64/20240509.1530",
     "arch": "x86_64",
     "cloudwatch-agent-available": "true",
     "instance_type": "t3a.xlarge",

cicd/shared-gh-workflows-context.yml

@@ -7,5 +7,5 @@ mandatory_os_slugs:
   - archlinux-lts
   - photonos-5-arm64
   - macos-12
-  - ubuntu-22.04-arm64
+  - ubuntu-24.04-arm64
   - windows-2022

tests/integration/cli/test_custom_module.py

@@ -35,8 +35,8 @@ from tests.support.case import SSHCase
 
 pytestmark = [
     pytest.mark.skipif(
-        "grains['osfinger'] == 'Fedora Linux-39'",
-        reason="Fedora 39 ships with Python 3.12. Test can't run with system Python on 3.12",
+        "grains['osfinger'] == 'Fedora Linux-40'",
+        reason="Fedora 40 ships with Python 3.12. Test can't run with system Python on 3.12",
         # Actually, the problem is that the tornado we ship is not prepared for Python 3.12,
         # and it imports `ssl` and checks if the `match_hostname` function is defined, which
         # has been deprecated since Python 3.7, so, the logic goes into trying to import

tests/integration/ssh/test_state.py

@@ -13,8 +13,8 @@ from tests.support.runtests import RUNTIME_VARS
 
 pytestmark = [
     pytest.mark.skipif(
-        "grains['osfinger'] == 'Fedora Linux-39'",
-        reason="Fedora 39 ships with Python 3.12. Test can't run with system Python on 3.12",
+        "grains['osfinger'] == 'Fedora Linux-40'",
+        reason="Fedora 40 ships with Python 3.12. Test can't run with system Python on 3.12",
         # Actually, the problem is that the tornado we ship is not prepared for Python 3.12,
         # and it imports `ssl` and checks if the `match_hostname` function is defined, which
         # has been deprecated since Python 3.7, so, the logic goes into trying to import

tests/pytests/integration/netapi/test_ssh_client.py

@@ -11,8 +11,8 @@ pytestmark = [
     pytest.mark.slow_test,
     pytest.mark.requires_sshd_server,
     pytest.mark.skipif(
-        "grains['osfinger'] == 'Fedora Linux-39'",
-        reason="Fedora 39 ships with Python 3.12. Test can't run with system Python on 3.12",
+        "grains['osfinger'] == 'Fedora Linux-40'",
+        reason="Fedora 40 ships with Python 3.12. Test can't run with system Python on 3.12",
         # Actually, the problem is that the tornado we ship is not prepared for Python 3.12,
         # and it imports `ssl` and checks if the `match_hostname` function is defined, which
         # has been deprecated since Python 3.7, so, the logic goes into trying to import

tests/pytests/integration/ssh/conftest.py

@@ -4,10 +4,10 @@ from tests.support.pytest.helpers import reap_stray_processes
 
 
 @pytest.fixture(scope="package", autouse=True)
-def _auto_skip_on_fedora_39(grains):
-    if grains["osfinger"] == "Fedora Linux-39":
+def _auto_skip_on_fedora_40(grains):
+    if grains["osfinger"] == "Fedora Linux-40":
         pytest.skip(
-            "Fedora 39 ships with Python 3.12. Test can't run with system Python on 3.12"
+            "Fedora 40 ships with Python 3.12. Test can't run with system Python on 3.12"
             # Actually, the problem is that the tornado we ship is not prepared for Python 3.12,
             # and it imports `ssl` and checks if the `match_hostname` function is defined, which
             # has been deprecated since Python 3.7, so, the logic goes into trying to import

tests/pytests/pkg/integration/test_systemd_config.py

@@ -21,8 +21,7 @@ def test_system_config(grains):
             "CentOS Stream-8",
             "CentOS Linux-8",
             "CentOS Stream-9",
-            "Fedora Linux-36",
-            "VMware Photon OS-3",
+            "Fedora Linux-40",
             "VMware Photon OS-4",
             "VMware Photon OS-5",
             "Amazon Linux-2023",

tools/pkg/repo/create.py

@@ -38,11 +38,6 @@ create = command_group(
 
 _deb_distro_info = {
     "debian": {
-        "10": {
-            "label": "deb10ary",
-            "codename": "buster",
-            "suitename": "oldoldstable",
-        },
         "11": {
             "label": "deb11ary",
             "codename": "bullseye",
@@ -63,9 +58,9 @@ _deb_distro_info = {
             "label": "salt_ubuntu2204",
             "codename": "jammy",
         },
-        "23.04": {
-            "label": "salt_ubuntu2304",
-            "codename": "lunar",
+        "24.04": {
+            "label": "salt_ubuntu2404",
+            "codename": "noble",
         },
     },
 }
@@ -316,8 +311,8 @@ def debian(
 _rpm_distro_info = {
     "amazon": ["2", "2023"],
     "redhat": ["7", "8", "9"],
-    "fedora": ["36", "37", "38", "39"],
-    "photon": ["3", "4", "5"],
+    "fedora": ["40"],
+    "photon": ["4", "5"],
 }
 
 

tools/precommit/workflows.py

@@ -57,7 +57,7 @@ TEST_SALT_LISTING = PlatformDefinitions(
             Linux(slug="debian-11-arm64", display_name="Debian 11 Arm64", arch="arm64"),
             Linux(slug="debian-12", display_name="Debian 12", arch="x86_64"),
             Linux(slug="debian-12-arm64", display_name="Debian 12 Arm64", arch="arm64"),
-            Linux(slug="fedora-39", display_name="Fedora 39", arch="x86_64"),
+            Linux(slug="fedora-40", display_name="Fedora 40", arch="x86_64"),
             Linux(slug="opensuse-15", display_name="Opensuse 15", arch="x86_64"),
             Linux(slug="photonos-4", display_name="Photon OS 4", arch="x86_64"),
             Linux(
@@ -103,6 +103,12 @@ TEST_SALT_LISTING = PlatformDefinitions(
                 display_name="Ubuntu 22.04 Arm64",
                 arch="arm64",
             ),
+            Linux(slug="ubuntu-24.04", display_name="Ubuntu 24.04", arch="x86_64"),
+            Linux(
+                slug="ubuntu-24.04-arm64",
+                display_name="Ubuntu 24.04 Arm64",
+                arch="arm64",
+            ),
         ],
         "macos": [
             MacOS(slug="macos-12", display_name="macOS 12", arch="x86_64"),
@@ -345,6 +351,18 @@ def generate_workflows(ctx: Context):
                     arch="arm64",
                     pkg_type="deb",
                 ),
+                Linux(
+                    slug="ubuntu-24.04",
+                    display_name="Ubuntu 24.04",
+                    arch="x86_64",
+                    pkg_type="deb",
+                ),
+                Linux(
+                    slug="ubuntu-24.04-arm64",
+                    display_name="Ubuntu 24.04 Arm64",
+                    arch="arm64",
+                    pkg_type="deb",
+                ),
             ],
             "macos": [
                 MacOS(slug="macos-12", display_name="macOS 12", arch="x86_64"),