Skip to content

ci: Fix f45 #2267

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Johan-Liebert1 merged 3 commits into from
Jun 29, 2026
+16 −1
Merged

ci: Fix f45 #2267

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bac9125
packaging: Preserve rpmbuild.env for F45+ RPM compatibility
cgwalters Jun 25, 2026
25a46c2
ci: Make fedora-45 (rawhide) package build non-gating
cgwalters Jun 25, 2026
e095ce6
repos: Exclude more kernel-debug-*
cgwalters Jun 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,8 @@ jobs:
test_os: ${{ fromJson(needs.compute-ci-level.outputs.package_os_matrix) }}

runs-on: ubuntu-24.04
# Rawhide is best-effort; don't let it block merges
continue-on-error: ${{ matrix.test_os == 'fedora-45' }}

steps:
- uses: actions/checkout@v7
Expand Down
7 changes: 6 additions & 1 deletion contrib/packaging/bootc.spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,8 +112,13 @@ cat vendor-config.toml >> .cargo/config.toml
rm vendor-config.toml
%else
# Container build: source already at _builddir (/src), nothing to extract
# RPM's %mkbuilddir creates a subdirectory; symlink it back to the source
# RPM's %mkbuilddir creates a subdirectory; symlink it back to the source.
# F45+ RPM also creates rpmbuild.env in the subdir that %build will source,
# so preserve it before replacing the directory with a symlink.
cd ..
if [ -f %{name}-%{version}-build/rpmbuild.env ]; then
mv %{name}-%{version}-build/rpmbuild.env .
fi
rm -rf %{name}-%{version}-build
ln -s . %{name}-%{version}-build
cd %{name}-%{version}-build
Expand Down
6 changes: 6 additions & 0 deletions contrib/packaging/enable-compose-repos
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ gpgcheck=1
enabled=1
priority=1
gpgkey=${gpgkey}
# Workaround for compose repos pulling in unwanted kernel subpackages
# xref https://github.com/bootc-dev/bootc/pull/2267#issuecomment-4809555535
exclude=kernel-debug* kernel-uki-virt*

[compose-appstream]
name=CentOS Stream \$releasever Compose AppStream
Expand All @@ -35,6 +38,9 @@ gpgcheck=1
enabled=1
priority=1
gpgkey=${gpgkey}
# Workaround for compose repos pulling in unwanted kernel subpackages
# xref https://github.com/bootc-dev/bootc/pull/2267#issuecomment-4809555535
exclude=kernel-debug* kernel-uki-virt*
EOF
echo "Enabled CentOS Stream compose repos (gpgkey: ${gpgkey})"
;;
Expand Down
2 changes: 2 additions & 0 deletions tmt/tests/booted/test-soft-reboot-selinux-policy.nu
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,7 @@ gpgcheck=1
enabled=1
priority=1
gpgkey=($gpgkey)
exclude=kernel-debug* kernel-uki-virt*

[compose-appstream]
name=CentOS Stream $releasever Compose AppStream
Expand All @@ -81,6 +82,7 @@ gpgcheck=1
enabled=1
priority=1
gpgkey=($gpgkey)
exclude=kernel-debug* kernel-uki-virt*
"
$repo_content | save --force centos-compose.repo

Expand Down
Loading