Add Fedora 40 and Ubuntu 24.04 support

saltstack · May 9, 2024 · 2d89ff8 · 2d89ff8
1 parent e89da8a
commit 2d89ff8
Show file tree

Hide file tree

Showing 15 changed files with 497 additions and 125 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -903,7 +903,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
@@ -922,6 +922,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'] }}
@@ -1537,15 +1579,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
@@ -1732,7 +1774,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
@@ -1751,6 +1793,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 }}
@@ -1778,7 +1862,7 @@ jobs:
       - debian-11-arm64
       - debian-12
       - debian-12-arm64
-      - fedora-39
+      - fedora-40
       - opensuse-15
       - photonos-4
       - photonos-4-arm64
@@ -1788,6 +1872,8 @@ jobs:
       - ubuntu-2004-arm64
       - ubuntu-2204
       - ubuntu-2204-arm64
+      - ubuntu-2404
+      - ubuntu-2404-arm64
     steps:
       - uses: actions/checkout@v4
 
@@ -1932,7 +2018,7 @@ jobs:
       - debian-11-arm64
       - debian-12
       - debian-12-arm64
-      - fedora-39
+      - fedora-40
       - opensuse-15
       - photonos-4
       - photonos-4-arm64
@@ -1942,6 +2028,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
@@ -1963,6 +2051,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
@@ -984,6 +984,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'] }}
@@ -1599,15 +1641,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
@@ -1813,6 +1855,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 }}
@@ -1840,7 +1924,7 @@ jobs:
       - debian-11-arm64
       - debian-12
       - debian-12-arm64
-      - fedora-39
+      - fedora-40
       - opensuse-15
       - photonos-4
       - photonos-4-arm64
@@ -1850,6 +1934,8 @@ jobs:
       - ubuntu-2004-arm64
       - ubuntu-2204
       - ubuntu-2204-arm64
+      - ubuntu-2404
+      - ubuntu-2404-arm64
     steps:
       - uses: actions/checkout@v4
 
@@ -2111,11 +2197,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:
@@ -2234,15 +2320,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
@@ -2746,7 +2832,7 @@ jobs:
       - debian-11-arm64
       - debian-12
       - debian-12-arm64
-      - fedora-39
+      - fedora-40
       - opensuse-15
       - photonos-4
       - photonos-4-arm64
@@ -2756,6 +2842,8 @@ jobs:
       - ubuntu-2004-arm64
       - ubuntu-2204
       - ubuntu-2204-arm64
+      - ubuntu-2404
+      - ubuntu-2404-arm64
 
     steps:
 
@@ -2835,6 +2923,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