From 9e7b942cbaa21504982ba08d829705313e23db2f Mon Sep 17 00:00:00 2001 From: Pedro Algarvio Date: Wed, 17 Jan 2024 06:04:09 +0000 Subject: [PATCH] Fix RPM build repository for aarch64 Signed-off-by: Pedro Algarvio --- .github/workflows/nightly.yml | 2 +- .github/workflows/staging.yml | 2 +- .../templates/build-rpm-repo.yml.jinja | 38 +------------------ tools/precommit/workflows.py | 12 ++++++ 4 files changed, 16 insertions(+), 38 deletions(-) diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index c4716979cb7..1d7fda50ad9 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -2569,7 +2569,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 == 'aarch64' && 'arm64' || matrix.arch }}-rpm path: artifacts/pkgs/incoming - name: Setup GnuPG diff --git a/.github/workflows/staging.yml b/.github/workflows/staging.yml index b96199f880f..0b6acfeddc8 100644 --- a/.github/workflows/staging.yml +++ b/.github/workflows/staging.yml @@ -2411,7 +2411,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 == 'aarch64' && 'arm64' || 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 4c785c82b1d..9f8ca8668be 100644 --- a/.github/workflows/templates/build-rpm-repo.yml.jinja +++ b/.github/workflows/templates/build-rpm-repo.yml.jinja @@ -3,41 +3,7 @@ fail-fast: false matrix: include: - <%- for distro, version, arch in ( - ("amazon", "2", "x86_64"), - ("amazon", "2", "arm64"), - ("amazon", "2", "aarch64"), - ("amazon", "2023", "x86_64"), - ("amazon", "2023", "arm64"), - ("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", "arm64"), - ("photon", "5", "aarch64"), - ) %> + <%- for distro, version, arch in build_rpms_listing %> - pkg-type: rpm distro: <{ distro }> version: "<{ version }>" @@ -66,7 +32,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 == 'aarch64' && 'arm64' || matrix.arch }}-rpm path: artifacts/pkgs/incoming - name: Setup GnuPG diff --git a/tools/precommit/workflows.py b/tools/precommit/workflows.py index 2fd31b54e4c..5f3e79365df 100644 --- a/tools/precommit/workflows.py +++ b/tools/precommit/workflows.py @@ -252,6 +252,17 @@ def generate_workflows(ctx: Context): for _, arch, _ in test_salt_pkg_downloads_listing[platform]: test_salt_pkg_downloads_needs_slugs.add("build-ci-deps") + build_rpms_listing = [] + for distro, releases in ( + ("amazon", ("2", "2023")), + ("redhat", ("7", "8", "9")), + ("fedora", ("36", "37", "38")), + ("photon", ("3", "4", "5")), + ): + for release in releases: + for arch in ("x86_64", "arm64", "aarch64"): + build_rpms_listing.append((distro, release, arch)) + env = Environment( block_start_string="<%", block_end_string="%>", @@ -293,6 +304,7 @@ def generate_workflows(ctx: Context): "test_salt_pkg_downloads_needs_slugs": sorted( test_salt_pkg_downloads_needs_slugs ), + "build_rpms_listing": build_rpms_listing, } shared_context = yaml.safe_load( tools.utils.SHARED_WORKFLOW_CONTEXT_FILEPATH.read_text()