From 27d85001754ab692b4972059071cda8f5f14a76d Mon Sep 17 00:00:00 2001 From: James Reilly Date: Tue, 14 Jan 2025 23:07:33 +0530 Subject: [PATCH] Added stream10 to matrix runners, added EL10 to zfs-release.spec CentOS Stream10 and other EL10 releases need a build a repo avaiable for them. Used the new GPG key and symlinked for building EL10 releases. Ensured that stream10 is part of the build matrix and and stream 10 to the list of runners. Note: this will increase build times as it is adding a 4th build to be run in addtion to AlmaLinux9, F41, and F40. Signed-off-by: James Reilly --- .github/workflows/scripts/qemu-2-start.sh | 6 ++++++ .github/workflows/zfs-qemu.yml | 2 +- zfs-release/zfs-release.spec | 4 ++++ 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/.github/workflows/scripts/qemu-2-start.sh b/.github/workflows/scripts/qemu-2-start.sh index 39ac9210..97b09dd9 100755 --- a/.github/workflows/scripts/qemu-2-start.sh +++ b/.github/workflows/scripts/qemu-2-start.sh @@ -44,6 +44,12 @@ case "$OS" in OSNAME="CentOS Stream 9" URL="https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2" ;; + centos-stream10) + OSNAME="CentOS Stream 10" + # TODO: https://github.com/openzfs/zfs/issues/16903 Overwrite OSv to stream9 for virt-install until it's added to osinfo + OSv="centos-stream9" + URL="https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-10-latest.x86_64.qcow2" + ;; debian11) OSNAME="Debian 11" URL="https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-amd64.qcow2" diff --git a/.github/workflows/zfs-qemu.yml b/.github/workflows/zfs-qemu.yml index 2a0ac078..4f1f3703 100644 --- a/.github/workflows/zfs-qemu.yml +++ b/.github/workflows/zfs-qemu.yml @@ -25,7 +25,7 @@ jobs: strategy: fail-fast: false matrix: - os: ["almalinux9", "fedora40", "fedora41"] + os: ["almalinux9", "centos-stream10", "fedora40", "fedora41"] runs-on: ubuntu-24.04 steps: - uses: actions/checkout@v4 diff --git a/zfs-release/zfs-release.spec b/zfs-release/zfs-release.spec index afc90519..192a835f 100644 --- a/zfs-release/zfs-release.spec +++ b/zfs-release/zfs-release.spec @@ -71,6 +71,8 @@ ln -s RPM-GPG-KEY-openzfs-2013 \ $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-8 ln -s RPM-GPG-KEY-openzfs-2022 \ $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-9 +ln -s RPM-GPG-KEY-openzfs-2022 \ + $RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-10 %endif %if 0%{?fedora} ln -s RPM-GPG-KEY-openzfs-2022 \ @@ -98,6 +100,8 @@ rm -rf $RPM_BUILD_ROOT %post %changelog +* Thu Dec 26 2024 James Reilly - 2-7 +- Add signing key for EL10 * Wed Oct 16 2024 Ralf Ertzinger - 2-6 - Add signing key for Fedora 41, drop link for Fedora 37 * Thu Mar 28 2024 Ralf Ertzinger - 2-5