diff --git a/.github/workflows/scripts/qemu-2-start.sh b/.github/workflows/scripts/qemu-2-start.sh index 39ac9210..1e8e7ff4 100755 --- a/.github/workflows/scripts/qemu-2-start.sh +++ b/.github/workflows/scripts/qemu-2-start.sh @@ -40,6 +40,12 @@ case "$OS" in # dns sometimes fails with that url :/ echo "89.187.191.12 geo.mirror.pkgbuild.com" | sudo tee /etc/hosts > /dev/null ;; + 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" + ;; centos-stream9) OSNAME="CentOS Stream 9" URL="https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.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/README.md b/zfs-release/README.md index 046f4685..a59da78b 100644 --- a/zfs-release/README.md +++ b/zfs-release/README.md @@ -1,6 +1,6 @@ ### How to build zfs-release RPMs: ``` -sudo yum -y install rpm-build +sudo dnf install -y rpm-build mkdir -p ~/rpmbuild/{BUILDROOT,SPECS,RPMS,SRPMS,SOURCES,BUILD} cp RPM-GPG-KEY-openzfs* *.repo ~/rpmbuild/SOURCES cp zfs-release.spec ~/rpmbuild/SPECS/ 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