Skip to content

Commit e2bb152

Browse files
authored
Added stream10 to matrix runners, added EL10 to zfs-release.spec (#96)
CentOS Stream10 and other EL10 releases need a build a repo available 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 <[email protected]> Reviewed-by: Tony Hutter <[email protected]>
1 parent 0b5eb19 commit e2bb152

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

.github/workflows/scripts/qemu-2-start.sh

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,12 @@ case "$OS" in
4444
OSNAME="CentOS Stream 9"
4545
URL="https://cloud.centos.org/centos/9-stream/x86_64/images/CentOS-Stream-GenericCloud-9-latest.x86_64.qcow2"
4646
;;
47+
centos-stream10)
48+
OSNAME="CentOS Stream 10"
49+
# TODO: https://github.com/openzfs/zfs/issues/16903 Overwrite OSv to stream9 for virt-install until it's added to osinfo
50+
OSv="centos-stream9"
51+
URL="https://cloud.centos.org/centos/10-stream/x86_64/images/CentOS-Stream-GenericCloud-10-latest.x86_64.qcow2"
52+
;;
4753
debian11)
4854
OSNAME="Debian 11"
4955
URL="https://cloud.debian.org/images/cloud/bullseye/latest/debian-11-generic-amd64.qcow2"

.github/workflows/zfs-qemu.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
strategy:
2626
fail-fast: false
2727
matrix:
28-
os: ["almalinux9", "fedora40", "fedora41"]
28+
os: ["almalinux9", "centos-stream10", "fedora40", "fedora41"]
2929
runs-on: ubuntu-24.04
3030
steps:
3131
- uses: actions/checkout@v4

zfs-release/zfs-release.spec

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,6 +71,8 @@ ln -s RPM-GPG-KEY-openzfs-2013 \
7171
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-8
7272
ln -s RPM-GPG-KEY-openzfs-2022 \
7373
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-9
74+
ln -s RPM-GPG-KEY-openzfs-2022 \
75+
$RPM_BUILD_ROOT%{_sysconfdir}/pki/rpm-gpg/RPM-GPG-KEY-openzfs-el-10
7476
%endif
7577
%if 0%{?fedora}
7678
ln -s RPM-GPG-KEY-openzfs-2022 \
@@ -98,6 +100,8 @@ rm -rf $RPM_BUILD_ROOT
98100
%post
99101

100102
%changelog
103+
* Thu Dec 26 2024 James Reilly <[email protected]> - 2-7
104+
- Add signing key for EL10
101105
* Wed Oct 16 2024 Ralf Ertzinger <[email protected]> - 2-6
102106
- Add signing key for Fedora 41, drop link for Fedora 37
103107
* Thu Mar 28 2024 Ralf Ertzinger <[email protected]> - 2-5

0 commit comments

Comments
 (0)