Skip to content

WIP/DNM - Add CentOS Stream 10 build support #1

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

Closed
lyarwood wants to merge 7 commits into from
Closed

WIP/DNM - Add CentOS Stream 10 build support #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
e7804d9
rpm: Add dual CentOS Stream 9/10 build support infrastructure
lyarwood Feb 3, 2026
10a6101
rpm: Add version-selecting aliases and fix libvirt-libs paths
lyarwood Jan 28, 2026
318cbd5
hack/builder: Add CentOS Stream 10 builder support
lyarwood Jan 28, 2026
73c28c9
rpm: Generate CentOS Stream 10 RPM dependencies
lyarwood Feb 3, 2026
9262c14
virt-launcher: Fix /var/run symlink for CentOS Stream 10 compatibility
lyarwood Jan 28, 2026
7008534
bazel/toolchain: Add CentOS Stream 10 GCC 14 toolchain
lyarwood Feb 3, 2026
ea14659
bazel/toolchain: Add ARM64 and s390x CS10 GCC 14 toolchains
lyarwood Feb 9, 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
5 changes: 5 additions & 0 deletions .bazelrc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ test:crossbuild-s390x --platforms=@io_bazel_rules_go//go/toolchain:linux_s390x_c

build --define gotags=selinux

# CentOS Stream version selection (default to CS9)
build --define=centos_stream_version=9
build:cs9 --define=centos_stream_version=9
build:cs10 --define=centos_stream_version=10

# let our unit tests produce our own junit reports
test --action_env=GO_TEST_WRAP=0

Expand Down
11 changes: 8 additions & 3 deletions BUILD.bazel
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,9 +139,14 @@ cc_library(
}),
linkstatic = 1,
strip_include_prefix = select({
"@io_bazel_rules_go//go/platform:linux_arm64": "/rpm/libvirt-libs_aarch64/usr/include/",
"@io_bazel_rules_go//go/platform:linux_s390x": "/rpm/libvirt-libs_s390x/usr/include/",
"//conditions:default": "/rpm/libvirt-libs_x86_64/usr/include/",
# CentOS Stream 10 combinations
"//rpm:x86_64_cs10": "/rpm/libvirt-libs_x86_64_cs10/usr/include/",
"//rpm:aarch64_cs10": "/rpm/libvirt-libs_aarch64_cs10/usr/include/",
"//rpm:s390x_cs10": "/rpm/libvirt-libs_s390x_cs10/usr/include/",
# CentOS Stream 9 combinations (default)
"//rpm:aarch64_cs9": "/rpm/libvirt-libs_aarch64_cs9/usr/include/",
"//rpm:s390x_cs9": "/rpm/libvirt-libs_s390x_cs9/usr/include/",
"//conditions:default": "/rpm/libvirt-libs_x86_64_cs9/usr/include/",
}),
visibility = ["//visibility:public"],
)
Expand Down
22 changes: 21 additions & 1 deletion Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
export GO15VENDOREXPERIMENT := 1

KUBEVIRT_CENTOS_STREAM_VERSION ?= 9

ifeq (${CI}, true)
# If we're running under a test lane, enable timestamps and disable progress output
TIMESTAMP=1
Expand Down Expand Up @@ -138,7 +140,18 @@ deps-sync:
SYNC_VENDOR=true hack/dockerized " ./hack/dep-update.sh --sync-only && ./hack/bazel-generate.sh"

rpm-deps:
SYNC_VENDOR=true hack/dockerized "CUSTOM_REPO=${CUSTOM_REPO} SINGLE_ARCH=${SINGLE_ARCH} BASESYSTEM=${BASESYSTEM} LIBVIRT_VERSION=${LIBVIRT_VERSION} QEMU_VERSION=${QEMU_VERSION} SEABIOS_VERSION=${SEABIOS_VERSION} EDK2_VERSION=${EDK2_VERSION} LIBGUESTFS_VERSION=${LIBGUESTFS_VERSION} GUESTFSTOOLS_VERSION=${GUESTFSTOOLS_VERSION} PASST_VERSION=${PASST_VERSION} VIRTIOFSD_VERSION=${VIRTIOFSD_VERSION} SWTPM_VERSION=${SWTPM_VERSION} ./hack/rpm-deps.sh"
SYNC_VENDOR=true hack/dockerized "KUBEVIRT_CENTOS_STREAM_VERSION=${KUBEVIRT_CENTOS_STREAM_VERSION} CUSTOM_REPO=${CUSTOM_REPO} SINGLE_ARCH=${SINGLE_ARCH} BASESYSTEM=${BASESYSTEM} LIBVIRT_VERSION=${LIBVIRT_VERSION} QEMU_VERSION=${QEMU_VERSION} SEABIOS_VERSION=${SEABIOS_VERSION} EDK2_VERSION=${EDK2_VERSION} LIBGUESTFS_VERSION=${LIBGUESTFS_VERSION} GUESTFSTOOLS_VERSION=${GUESTFSTOOLS_VERSION} PASST_VERSION=${PASST_VERSION} VIRTIOFSD_VERSION=${VIRTIOFSD_VERSION} SWTPM_VERSION=${SWTPM_VERSION} ./hack/rpm-deps.sh"

rpm-deps-cs9:
$(MAKE) rpm-deps KUBEVIRT_CENTOS_STREAM_VERSION=9

rpm-deps-cs10:
$(MAKE) rpm-deps KUBEVIRT_CENTOS_STREAM_VERSION=10

rpm-deps-all:
$(MAKE) rpm-deps-cs9
$(MAKE) rpm-deps-cs10
hack/rpm-deps-aliases.sh

bump-images:
hack/dockerized "./hack/rpm-deps.sh && ./hack/bump-distroless.sh"
Expand Down Expand Up @@ -179,6 +192,9 @@ builder-build:
builder-publish:
./hack/builder/publish.sh

builder-build-cs10:
./hack/builder/build-cs10.sh

olm-verify:
hack/dockerized "./hack/olm.sh verify"

Expand Down Expand Up @@ -266,4 +282,8 @@ update-generated-api-testdata:
lint \
lint-metrics \
update-generated-api-testdata \
rpm-deps \
rpm-deps-cs9 \
rpm-deps-cs10 \
rpm-deps-all \
$(NULL)
Loading
Loading