diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 62fa68b30c0..e4e4f890efc 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -3126,6 +3126,9 @@ jobs: arch: x86_64 - pkg-type: rpm distro: amazon + version: "2" + arch: arm64 + - distro: amazon version: "2" arch: aarch64 - pkg-type: rpm @@ -3142,6 +3145,9 @@ jobs: arch: x86_64 - pkg-type: rpm distro: redhat + version: "7" + arch: arm64 + - distro: redhat version: "7" arch: aarch64 - pkg-type: rpm @@ -3150,6 +3156,9 @@ jobs: arch: x86_64 - pkg-type: rpm distro: redhat + version: "8" + arch: arm64 + - distro: redhat version: "8" arch: aarch64 - pkg-type: rpm @@ -3158,6 +3167,9 @@ jobs: arch: x86_64 - pkg-type: rpm distro: redhat + version: "9" + arch: arm64 + - distro: redhat version: "9" arch: aarch64 - pkg-type: rpm @@ -3166,6 +3178,9 @@ jobs: arch: x86_64 - pkg-type: rpm distro: fedora + version: "36" + arch: arm64 + - distro: fedora version: "36" arch: aarch64 - pkg-type: rpm @@ -3174,6 +3189,9 @@ jobs: arch: x86_64 - pkg-type: rpm distro: fedora + version: "37" + arch: arm64 + - distro: fedora version: "37" arch: aarch64 - pkg-type: rpm @@ -3182,6 +3200,9 @@ jobs: arch: x86_64 - pkg-type: rpm distro: fedora + version: "38" + arch: arm64 + - distro: fedora version: "38" arch: aarch64 - pkg-type: rpm @@ -3190,6 +3211,9 @@ jobs: arch: x86_64 - pkg-type: rpm distro: photon + version: "3" + arch: arm64 + - distro: photon version: "3" arch: aarch64 - pkg-type: rpm @@ -3198,6 +3222,9 @@ jobs: arch: x86_64 - pkg-type: rpm distro: photon + version: "4" + arch: arm64 + - distro: photon version: "4" arch: aarch64 - pkg-type: rpm @@ -3229,7 +3256,7 @@ jobs: - name: Download RPM Packages uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-rpm + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}-rpm path: artifacts/pkgs/incoming - name: Setup GnuPG diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index c185f9cb127..c09bbbcd56a 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -2941,6 +2941,9 @@ jobs: arch: x86_64 - pkg-type: rpm distro: amazon + version: "2" + arch: arm64 + - distro: amazon version: "2" arch: aarch64 - pkg-type: rpm @@ -2957,6 +2960,9 @@ jobs: arch: x86_64 - pkg-type: rpm distro: redhat + version: "7" + arch: arm64 + - distro: redhat version: "7" arch: aarch64 - pkg-type: rpm @@ -2965,6 +2971,9 @@ jobs: arch: x86_64 - pkg-type: rpm distro: redhat + version: "8" + arch: arm64 + - distro: redhat version: "8" arch: aarch64 - pkg-type: rpm @@ -2973,6 +2982,9 @@ jobs: arch: x86_64 - pkg-type: rpm distro: redhat + version: "9" + arch: arm64 + - distro: redhat version: "9" arch: aarch64 - pkg-type: rpm @@ -2981,6 +2993,9 @@ jobs: arch: x86_64 - pkg-type: rpm distro: fedora + version: "36" + arch: arm64 + - distro: fedora version: "36" arch: aarch64 - pkg-type: rpm @@ -2989,6 +3004,9 @@ jobs: arch: x86_64 - pkg-type: rpm distro: fedora + version: "37" + arch: arm64 + - distro: fedora version: "37" arch: aarch64 - pkg-type: rpm @@ -2997,6 +3015,9 @@ jobs: arch: x86_64 - pkg-type: rpm distro: fedora + version: "38" + arch: arm64 + - distro: fedora version: "38" arch: aarch64 - pkg-type: rpm @@ -3005,6 +3026,9 @@ jobs: arch: x86_64 - pkg-type: rpm distro: photon + version: "3" + arch: arm64 + - distro: photon version: "3" arch: aarch64 - pkg-type: rpm @@ -3013,6 +3037,9 @@ jobs: arch: x86_64 - pkg-type: rpm distro: photon + version: "4" + arch: arm64 + - distro: photon version: "4" arch: aarch64 - pkg-type: rpm @@ -3044,7 +3071,7 @@ jobs: - name: Download RPM Packages uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-rpm + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}-rpm path: artifacts/pkgs/incoming - name: Setup GnuPG diff --git a/.github/workflows/templates/build-rpm-repo.yml.jinja b/.github/workflows/templates/build-rpm-repo.yml.jinja index 208f2096301..46c427c09b8 100644 --- a/.github/workflows/templates/build-rpm-repo.yml.jinja +++ b/.github/workflows/templates/build-rpm-repo.yml.jinja @@ -5,24 +5,33 @@ include: <%- for distro, version, arch in ( ("amazon", "2", "x86_64"), + ("amazon", "2", "arm64"), ("amazon", "2", "aarch64"), ("amazon", "2023", "x86_64"), ("amazon", "2023", "aarch64"), ("redhat", "7", "x86_64"), + ("redhat", "7", "arm64"), ("redhat", "7", "aarch64"), ("redhat", "8", "x86_64"), + ("redhat", "8", "arm64"), ("redhat", "8", "aarch64"), ("redhat", "9", "x86_64"), + ("redhat", "9", "arm64"), ("redhat", "9", "aarch64"), ("fedora", "36", "x86_64"), + ("fedora", "36", "arm64"), ("fedora", "36", "aarch64"), ("fedora", "37", "x86_64"), + ("fedora", "37", "arm64"), ("fedora", "37", "aarch64"), ("fedora", "38", "x86_64"), + ("fedora", "38", "arm64"), ("fedora", "38", "aarch64"), ("photon", "3", "x86_64"), + ("photon", "3", "arm64"), ("photon", "3", "aarch64"), ("photon", "4", "x86_64"), + ("photon", "4", "arm64"), ("photon", "4", "aarch64"), ("photon", "5", "x86_64"), ("photon", "5", "aarch64"), @@ -53,7 +62,7 @@ - name: Download RPM Packages uses: actions/download-artifact@v3 with: - name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch }}-rpm + name: salt-${{ needs.prepare-workflow.outputs.salt-version }}-${{ matrix.arch == 'arm64' && 'aarch64' || matrix.arch }}-rpm path: artifacts/pkgs/incoming - name: Setup GnuPG diff --git a/tools/pkg/repo/create.py b/tools/pkg/repo/create.py index b1cc0471f9e..8dfbf9dc459 100644 --- a/tools/pkg/repo/create.py +++ b/tools/pkg/repo/create.py @@ -396,10 +396,6 @@ def rpm( ctx.error(f"Support for {display_name} is missing.") ctx.exit(1) - if distro_arch == "aarch64": - ctx.info(f"The {distro_arch} arch is an alias for 'arm64'. Adjusting.") - distro_arch = "arm64" - ctx.info("Creating repository directory structure ...") create_repo_path = create_top_level_repo_path( ctx,