diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index c43fb31f71c0..6aaf8e87a37f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -797,6 +797,40 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + amazonlinux-2023-ci-deps: + name: Amazon Linux 2023 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-linux + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2023 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + amazonlinux-2023-arm64-ci-deps: + name: Amazon Linux 2023 Arm64 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-linux + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2023-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + archlinux-lts-ci-deps: name: Arch Linux LTS Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1227,6 +1261,72 @@ jobs: skip-junit-reports: ${{ github.event_name == 'pull_request' }} testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + amazonlinux-2-arm64-pkg-tests: + name: Amazon Linux 2 Arm64 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-rpm-pkgs-onedir + - amazonlinux-2-arm64-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: amazonlinux-2-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: rpm + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} + skip-junit-reports: ${{ github.event_name == 'pull_request' }} + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + + amazonlinux-2023-pkg-tests: + name: Amazon Linux 2023 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-rpm-pkgs-onedir + - amazonlinux-2023-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: amazonlinux-2023 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: rpm + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} + skip-junit-reports: ${{ github.event_name == 'pull_request' }} + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + + amazonlinux-2023-arm64-pkg-tests: + name: Amazon Linux 2023 Arm64 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-rpm-pkgs-onedir + - amazonlinux-2023-arm64-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: amazonlinux-2023-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: rpm + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} + skip-junit-reports: ${{ github.event_name == 'pull_request' }} + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + centos-7-pkg-tests: name: CentOS 7 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1851,6 +1951,66 @@ jobs: skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} skip-junit-reports: ${{ github.event_name == 'pull_request' }} + amazonlinux-2-arm64: + name: Amazon Linux 2 Arm64 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - amazonlinux-2-arm64-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: amazonlinux-2-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + 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.13 + skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} + skip-junit-reports: ${{ github.event_name == 'pull_request' }} + + amazonlinux-2023: + name: Amazon Linux 2023 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - amazonlinux-2023-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: amazonlinux-2023 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + 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.13 + skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} + skip-junit-reports: ${{ github.event_name == 'pull_request' }} + + amazonlinux-2023-arm64: + name: Amazon Linux 2023 Arm64 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - amazonlinux-2023-arm64-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: amazonlinux-2023-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + 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.13 + skip-code-coverage: ${{ fromJSON(needs.prepare-workflow.outputs.testrun)['skip_code_coverage'] }} + skip-junit-reports: ${{ github.event_name == 'pull_request' }} + archlinux-lts: name: Arch Linux LTS Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -2247,6 +2407,8 @@ jobs: - almalinux-9-arm64-ci-deps - amazonlinux-2-ci-deps - amazonlinux-2-arm64-ci-deps + - amazonlinux-2023-ci-deps + - amazonlinux-2023-arm64-ci-deps - archlinux-lts-ci-deps - centos-7-ci-deps - centos-7-arm64-ci-deps @@ -2278,6 +2440,9 @@ jobs: - almalinux-8 - almalinux-9 - amazonlinux-2 + - amazonlinux-2-arm64 + - amazonlinux-2023 + - amazonlinux-2023-arm64 - archlinux-lts - centos-7 - centosstream-8 @@ -2406,6 +2571,8 @@ jobs: - almalinux-9-arm64-ci-deps - amazonlinux-2-ci-deps - amazonlinux-2-arm64-ci-deps + - amazonlinux-2023-ci-deps + - amazonlinux-2023-arm64-ci-deps - archlinux-lts-ci-deps - centos-7-ci-deps - centos-7-arm64-ci-deps @@ -2437,6 +2604,9 @@ jobs: - almalinux-8 - almalinux-9 - amazonlinux-2 + - amazonlinux-2-arm64 + - amazonlinux-2023 + - amazonlinux-2023-arm64 - archlinux-lts - centos-7 - centosstream-8 @@ -2457,6 +2627,9 @@ jobs: - ubuntu-2204 - ubuntu-2204-arm64 - amazonlinux-2-pkg-tests + - amazonlinux-2-arm64-pkg-tests + - amazonlinux-2023-pkg-tests + - amazonlinux-2023-arm64-pkg-tests - centos-7-pkg-tests - centosstream-8-pkg-tests - centosstream-9-pkg-tests diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 1fb508551cac..2f9fa25a4494 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -858,6 +858,40 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + amazonlinux-2023-ci-deps: + name: Amazon Linux 2023 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-linux + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2023 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + amazonlinux-2023-arm64-ci-deps: + name: Amazon Linux 2023 Arm64 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-linux + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2023-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + archlinux-lts-ci-deps: name: Arch Linux LTS Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1288,6 +1322,72 @@ jobs: skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + amazonlinux-2-arm64-pkg-tests: + name: Amazon Linux 2 Arm64 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-rpm-pkgs-onedir + - amazonlinux-2-arm64-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: amazonlinux-2-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: rpm + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + + amazonlinux-2023-pkg-tests: + name: Amazon Linux 2023 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-rpm-pkgs-onedir + - amazonlinux-2023-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: amazonlinux-2023 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: rpm + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + + amazonlinux-2023-arm64-pkg-tests: + name: Amazon Linux 2023 Arm64 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-rpm-pkgs-onedir + - amazonlinux-2023-arm64-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: amazonlinux-2023-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: rpm + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + centos-7-pkg-tests: name: CentOS 7 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1912,6 +2012,66 @@ jobs: skip-code-coverage: false skip-junit-reports: false + amazonlinux-2-arm64: + name: Amazon Linux 2 Arm64 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - amazonlinux-2-arm64-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: amazonlinux-2-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + 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.13 + skip-code-coverage: false + skip-junit-reports: false + + amazonlinux-2023: + name: Amazon Linux 2023 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - amazonlinux-2023-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: amazonlinux-2023 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + 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.13 + skip-code-coverage: false + skip-junit-reports: false + + amazonlinux-2023-arm64: + name: Amazon Linux 2023 Arm64 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - amazonlinux-2023-arm64-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: amazonlinux-2023-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + 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.13 + skip-code-coverage: false + skip-junit-reports: false + archlinux-lts: name: Arch Linux LTS Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -2308,6 +2468,8 @@ jobs: - almalinux-9-arm64-ci-deps - amazonlinux-2-ci-deps - amazonlinux-2-arm64-ci-deps + - amazonlinux-2023-ci-deps + - amazonlinux-2023-arm64-ci-deps - archlinux-lts-ci-deps - centos-7-ci-deps - centos-7-arm64-ci-deps @@ -2339,6 +2501,9 @@ jobs: - almalinux-8 - almalinux-9 - amazonlinux-2 + - amazonlinux-2-arm64 + - amazonlinux-2023 + - amazonlinux-2023-arm64 - archlinux-lts - centos-7 - centosstream-8 @@ -2682,6 +2847,14 @@ jobs: distro: amazon version: "2" arch: aarch64 + - pkg-type: rpm + distro: amazon + version: "2023" + arch: x86_64 + - pkg-type: rpm + distro: amazon + version: "2023" + arch: aarch64 - pkg-type: rpm distro: redhat version: "7" @@ -3150,6 +3323,8 @@ jobs: - almalinux-9-arm64-ci-deps - amazonlinux-2-ci-deps - amazonlinux-2-arm64-ci-deps + - amazonlinux-2023-ci-deps + - amazonlinux-2023-arm64-ci-deps - archlinux-lts-ci-deps - centos-7-ci-deps - centos-7-arm64-ci-deps @@ -3181,6 +3356,9 @@ jobs: - almalinux-8 - almalinux-9 - amazonlinux-2 + - amazonlinux-2-arm64 + - amazonlinux-2023 + - amazonlinux-2023-arm64 - archlinux-lts - centos-7 - centosstream-8 @@ -3262,6 +3440,9 @@ jobs: - combine-all-code-coverage - publish-repositories - amazonlinux-2-pkg-tests + - amazonlinux-2-arm64-pkg-tests + - amazonlinux-2023-pkg-tests + - amazonlinux-2023-arm64-pkg-tests - centos-7-pkg-tests - centosstream-8-pkg-tests - centosstream-9-pkg-tests diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6810dc17199f..5ca26d4dc9cb 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -322,6 +322,38 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + amazonlinux-2023-ci-deps: + name: Amazon Linux 2023 Deps + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2023 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + amazonlinux-2023-arm64-ci-deps: + name: Amazon Linux 2023 Arm64 Deps + needs: + - prepare-workflow + - download-onedir-artifact + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2023-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + archlinux-lts-ci-deps: name: Arch Linux LTS Deps needs: @@ -779,6 +811,8 @@ jobs: - almalinux-9-ci-deps - amazonlinux-2-arm64-ci-deps - amazonlinux-2-ci-deps + - amazonlinux-2023-arm64-ci-deps + - amazonlinux-2023-ci-deps - centos-7-arm64-ci-deps - centos-7-ci-deps - centosstream-8-arm64-ci-deps @@ -1000,6 +1034,8 @@ jobs: - almalinux-9-arm64-ci-deps - amazonlinux-2-ci-deps - amazonlinux-2-arm64-ci-deps + - amazonlinux-2023-ci-deps + - amazonlinux-2023-arm64-ci-deps - archlinux-lts-ci-deps - centos-7-ci-deps - centos-7-arm64-ci-deps diff --git a/.github/workflows/scheduled.yml b/.github/workflows/scheduled.yml index 756a07df6add..b5fa94880d3d 100644 --- a/.github/workflows/scheduled.yml +++ b/.github/workflows/scheduled.yml @@ -831,6 +831,40 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + amazonlinux-2023-ci-deps: + name: Amazon Linux 2023 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-linux + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2023 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + amazonlinux-2023-arm64-ci-deps: + name: Amazon Linux 2023 Arm64 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-linux + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2023-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + archlinux-lts-ci-deps: name: Arch Linux LTS Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1261,6 +1295,72 @@ jobs: skip-junit-reports: false testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + amazonlinux-2-arm64-pkg-tests: + name: Amazon Linux 2 Arm64 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-rpm-pkgs-onedir + - amazonlinux-2-arm64-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: amazonlinux-2-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: rpm + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + + amazonlinux-2023-pkg-tests: + name: Amazon Linux 2023 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-rpm-pkgs-onedir + - amazonlinux-2023-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: amazonlinux-2023 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: rpm + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + + amazonlinux-2023-arm64-pkg-tests: + name: Amazon Linux 2023 Arm64 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-rpm-pkgs-onedir + - amazonlinux-2023-arm64-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: amazonlinux-2023-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: rpm + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: false + skip-junit-reports: false + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + centos-7-pkg-tests: name: CentOS 7 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1885,6 +1985,66 @@ jobs: skip-code-coverage: false skip-junit-reports: false + amazonlinux-2-arm64: + name: Amazon Linux 2 Arm64 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - amazonlinux-2-arm64-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: amazonlinux-2-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + 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.13 + skip-code-coverage: false + skip-junit-reports: false + + amazonlinux-2023: + name: Amazon Linux 2023 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - amazonlinux-2023-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: amazonlinux-2023 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + 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.13 + skip-code-coverage: false + skip-junit-reports: false + + amazonlinux-2023-arm64: + name: Amazon Linux 2023 Arm64 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - amazonlinux-2023-arm64-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: amazonlinux-2023-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + 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.13 + skip-code-coverage: false + skip-junit-reports: false + archlinux-lts: name: Arch Linux LTS Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -2281,6 +2441,8 @@ jobs: - almalinux-9-arm64-ci-deps - amazonlinux-2-ci-deps - amazonlinux-2-arm64-ci-deps + - amazonlinux-2023-ci-deps + - amazonlinux-2023-arm64-ci-deps - archlinux-lts-ci-deps - centos-7-ci-deps - centos-7-arm64-ci-deps @@ -2312,6 +2474,9 @@ jobs: - almalinux-8 - almalinux-9 - amazonlinux-2 + - amazonlinux-2-arm64 + - amazonlinux-2023 + - amazonlinux-2023-arm64 - archlinux-lts - centos-7 - centosstream-8 @@ -2442,6 +2607,8 @@ jobs: - almalinux-9-arm64-ci-deps - amazonlinux-2-ci-deps - amazonlinux-2-arm64-ci-deps + - amazonlinux-2023-ci-deps + - amazonlinux-2023-arm64-ci-deps - archlinux-lts-ci-deps - centos-7-ci-deps - centos-7-arm64-ci-deps @@ -2473,6 +2640,9 @@ jobs: - almalinux-8 - almalinux-9 - amazonlinux-2 + - amazonlinux-2-arm64 + - amazonlinux-2023 + - amazonlinux-2023-arm64 - archlinux-lts - centos-7 - centosstream-8 @@ -2493,6 +2663,9 @@ jobs: - ubuntu-2204 - ubuntu-2204-arm64 - amazonlinux-2-pkg-tests + - amazonlinux-2-arm64-pkg-tests + - amazonlinux-2023-pkg-tests + - amazonlinux-2023-arm64-pkg-tests - centos-7-pkg-tests - centosstream-8-pkg-tests - centosstream-9-pkg-tests diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index 378aad8bd21f..d45360be3f30 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -853,6 +853,40 @@ jobs: salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + amazonlinux-2023-ci-deps: + name: Amazon Linux 2023 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-linux + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2023 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + + amazonlinux-2023-arm64-ci-deps: + name: Amazon Linux 2023 Arm64 Deps + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-salt-onedir-linux + uses: ./.github/workflows/build-deps-ci-action.yml + with: + distro-slug: amazonlinux-2023-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + python-version: "3.10" + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + archlinux-lts-ci-deps: name: Arch Linux LTS Deps if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['build-deps-ci'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1283,6 +1317,72 @@ jobs: skip-junit-reports: true testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + amazonlinux-2-arm64-pkg-tests: + name: Amazon Linux 2 Arm64 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-rpm-pkgs-onedir + - amazonlinux-2-arm64-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: amazonlinux-2-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: rpm + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: true + skip-junit-reports: true + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + + amazonlinux-2023-pkg-tests: + name: Amazon Linux 2023 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-rpm-pkgs-onedir + - amazonlinux-2023-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: amazonlinux-2023 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: rpm + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: true + skip-junit-reports: true + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + + amazonlinux-2023-arm64-pkg-tests: + name: Amazon Linux 2023 Arm64 Package Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - build-rpm-pkgs-onedir + - amazonlinux-2023-arm64-ci-deps + uses: ./.github/workflows/test-packages-action.yml + with: + distro-slug: amazonlinux-2023-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + salt-version: "${{ needs.prepare-workflow.outputs.salt-version }}" + pkg-type: rpm + nox-version: 2022.8.7 + python-version: "3.10" + cache-prefix: ${{ needs.prepare-workflow.outputs.cache-seed }}|3.10.13 + skip-code-coverage: true + skip-junit-reports: true + testing-releases: ${{ needs.prepare-workflow.outputs.testing-releases }} + centos-7-pkg-tests: name: CentOS 7 Package Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test-pkg'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -1907,6 +2007,66 @@ jobs: skip-code-coverage: true skip-junit-reports: true + amazonlinux-2-arm64: + name: Amazon Linux 2 Arm64 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - amazonlinux-2-arm64-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: amazonlinux-2-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + 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.13 + skip-code-coverage: true + skip-junit-reports: true + + amazonlinux-2023: + name: Amazon Linux 2023 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - amazonlinux-2023-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: amazonlinux-2023 + nox-session: ci-test-onedir + platform: linux + arch: x86_64 + nox-version: 2022.8.7 + 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.13 + skip-code-coverage: true + skip-junit-reports: true + + amazonlinux-2023-arm64: + name: Amazon Linux 2023 Arm64 Test + if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} + needs: + - prepare-workflow + - amazonlinux-2023-arm64-ci-deps + uses: ./.github/workflows/test-action.yml + with: + distro-slug: amazonlinux-2023-arm64 + nox-session: ci-test-onedir + platform: linux + arch: aarch64 + nox-version: 2022.8.7 + 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.13 + skip-code-coverage: true + skip-junit-reports: true + archlinux-lts: name: Arch Linux LTS Test if: ${{ fromJSON(needs.prepare-workflow.outputs.jobs)['test'] && fromJSON(needs.prepare-workflow.outputs.runners)['self-hosted'] }} @@ -2534,6 +2694,14 @@ jobs: distro: amazon version: "2" arch: aarch64 + - pkg-type: rpm + distro: amazon + version: "2023" + arch: x86_64 + - pkg-type: rpm + distro: amazon + version: "2023" + arch: aarch64 - pkg-type: rpm distro: redhat version: "7" @@ -3106,6 +3274,8 @@ jobs: - almalinux-9-ci-deps - amazonlinux-2-arm64-ci-deps - amazonlinux-2-ci-deps + - amazonlinux-2023-arm64-ci-deps + - amazonlinux-2023-ci-deps - centos-7-arm64-ci-deps - centos-7-ci-deps - centosstream-8-arm64-ci-deps @@ -3161,6 +3331,8 @@ jobs: - almalinux-9-arm64-ci-deps - amazonlinux-2-ci-deps - amazonlinux-2-arm64-ci-deps + - amazonlinux-2023-ci-deps + - amazonlinux-2023-arm64-ci-deps - archlinux-lts-ci-deps - centos-7-ci-deps - centos-7-arm64-ci-deps @@ -3192,6 +3364,9 @@ jobs: - almalinux-8 - almalinux-9 - amazonlinux-2 + - amazonlinux-2-arm64 + - amazonlinux-2023 + - amazonlinux-2023-arm64 - archlinux-lts - centos-7 - centosstream-8 @@ -3212,6 +3387,9 @@ jobs: - ubuntu-2204 - ubuntu-2204-arm64 - amazonlinux-2-pkg-tests + - amazonlinux-2-arm64-pkg-tests + - amazonlinux-2023-pkg-tests + - amazonlinux-2023-arm64-pkg-tests - centos-7-pkg-tests - centosstream-8-pkg-tests - centosstream-9-pkg-tests diff --git a/.github/workflows/templates/build-rpm-repo.yml.jinja b/.github/workflows/templates/build-rpm-repo.yml.jinja index 238bb00d6423..5b67a0977476 100644 --- a/.github/workflows/templates/build-rpm-repo.yml.jinja +++ b/.github/workflows/templates/build-rpm-repo.yml.jinja @@ -6,6 +6,8 @@ <%- for distro, version, arch in ( ("amazon", "2", "x86_64"), ("amazon", "2", "aarch64"), + ("amazon", "2023", "x86_64"), + ("amazon", "2023", "aarch64"), ("redhat", "7", "x86_64"), ("redhat", "7", "aarch64"), ("redhat", "8", "x86_64"), diff --git a/.github/workflows/test-package-downloads-action.yml b/.github/workflows/test-package-downloads-action.yml index 9ab635d68555..8f97297776c9 100644 --- a/.github/workflows/test-package-downloads-action.yml +++ b/.github/workflows/test-package-downloads-action.yml @@ -83,6 +83,12 @@ jobs: - distro-slug: amazonlinux-2-arm64 arch: aarch64 pkg-type: package + - distro-slug: amazonlinux-2023 + arch: x86_64 + pkg-type: package + - distro-slug: amazonlinux-2023-arm64 + arch: aarch64 + pkg-type: package - distro-slug: centos-7 arch: x86_64 pkg-type: package diff --git a/changelog/64455.added.md b/changelog/64455.added.md new file mode 100644 index 000000000000..8885a93e59f1 --- /dev/null +++ b/changelog/64455.added.md @@ -0,0 +1 @@ +Added Salt support for Amazon Linux 2023 diff --git a/cicd/golden-images.json b/cicd/golden-images.json index 962af9809e68..8ee7e3f83bab 100644 --- a/cicd/golden-images.json +++ b/cicd/golden-images.json @@ -40,9 +40,9 @@ "ssh_username": "ec2-user" }, "amazonlinux-2-arm64": { - "ami": "ami-010d24ab23bfb0330", + "ami": "ami-07a693678b4d0d06c", "ami_description": "CI Image of AmazonLinux 2 arm64", - "ami_name": "salt-project/ci/amazonlinux/2/arm64/20231005.1614", + "ami_name": "salt-project/ci/amazonlinux/2/arm64/20231009.2037", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", @@ -50,29 +50,29 @@ "ssh_username": "ec2-user" }, "amazonlinux-2": { - "ami": "ami-0ad016fe17f923c6b", + "ami": "ami-01cef47eb0f1d5363", "ami_description": "CI Image of AmazonLinux 2 x86_64", - "ami_name": "salt-project/ci/amazonlinux/2/x86_64/20231005.1614", + "ami_name": "salt-project/ci/amazonlinux/2/x86_64/20231009.2037", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", "is_windows": "false", "ssh_username": "ec2-user" }, - "amazonlinux-2023.1-arm64": { - "ami": "ami-037b7d6177ec8259d", - "ami_description": "CI Image of AmazonLinux 2023.1 arm64", - "ami_name": "salt-project/ci/amazonlinux/2023.1/arm64/20231005.1555", + "amazonlinux-2023-arm64": { + "ami": "ami-04b90f4620a055f43", + "ami_description": "CI Image of AmazonLinux 2023 arm64", + "ami_name": "salt-project/ci/amazonlinux/2023/arm64/20231009.2036", "arch": "arm64", "cloudwatch-agent-available": "true", "instance_type": "m6g.large", "is_windows": "false", "ssh_username": "ec2-user" }, - "amazonlinux-2023.1": { - "ami": "ami-08e04f6dd44c858fa", - "ami_description": "CI Image of AmazonLinux 2023.1 x86_64", - "ami_name": "salt-project/ci/amazonlinux/2023.1/x86_64/20231005.1555", + "amazonlinux-2023": { + "ami": "ami-075c3c46d2d799a88", + "ami_description": "CI Image of AmazonLinux 2023 x86_64", + "ami_name": "salt-project/ci/amazonlinux/2023/x86_64/20231009.2036", "arch": "x86_64", "cloudwatch-agent-available": "true", "instance_type": "t3a.large", diff --git a/tools/ci.py b/tools/ci.py index 20d785759651..d593cb51d182 100644 --- a/tools/ci.py +++ b/tools/ci.py @@ -705,6 +705,8 @@ def pkg_matrix( if ( distro_slug not in [ + "amazon-2023", + "amazon-2023-arm64", "debian-11-arm64", # TODO: remove debian 12 once debian 12 pkgs are released "debian-12-arm64", @@ -743,6 +745,8 @@ def pkg_matrix( if ( distro_slug not in [ + "amazon-2023", + "amazon-2023-arm64", "centosstream-9", "debian-11-arm64", "debian-12-arm64", diff --git a/tools/pre_commit.py b/tools/pre_commit.py index 9598f06aedc8..3abaa580a409 100644 --- a/tools/pre_commit.py +++ b/tools/pre_commit.py @@ -89,6 +89,9 @@ def generate_workflows(ctx: Context): ("almalinux-8", "Alma Linux 8", "x86_64"), ("almalinux-9", "Alma Linux 9", "x86_64"), ("amazonlinux-2", "Amazon Linux 2", "x86_64"), + ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64"), + ("amazonlinux-2023", "Amazon Linux 2023", "x86_64"), + ("amazonlinux-2023-arm64", "Amazon Linux 2023 Arm64", "aarch64"), ("archlinux-lts", "Arch Linux LTS", "x86_64"), ("centos-7", "CentOS 7", "x86_64"), ("centosstream-8", "CentOS Stream 8", "x86_64"), @@ -119,6 +122,9 @@ def generate_workflows(ctx: Context): test_salt_pkg_listing = { "linux": ( ("amazonlinux-2", "Amazon Linux 2", "x86_64", "rpm"), + ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64", "rpm"), + ("amazonlinux-2023", "Amazon Linux 2023", "x86_64", "rpm"), + ("amazonlinux-2023-arm64", "Amazon Linux 2023 Arm64", "aarch64", "rpm"), ("centos-7", "CentOS 7", "x86_64", "rpm"), ("centosstream-8", "CentOS Stream 8", "x86_64", "rpm"), ("centosstream-9", "CentOS Stream 9", "x86_64", "rpm"), @@ -150,6 +156,8 @@ def generate_workflows(ctx: Context): ("almalinux-9-arm64", "Alma Linux 9 Arm64", "aarch64"), ("amazonlinux-2", "Amazon Linux 2", "x86_64"), ("amazonlinux-2-arm64", "Amazon Linux 2 Arm64", "aarch64"), + ("amazonlinux-2023", "Amazon Linux 2023", "x86_64"), + ("amazonlinux-2023-arm64", "Amazon Linux 2023 Arm64", "aarch64"), ("archlinux-lts", "Arch Linux LTS", "x86_64"), ("centos-7", "CentOS 7", "x86_64"), ("centos-7-arm64", "CentOS 7 Arm64", "aarch64"),