github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-08-09 08:12:47 +00:00
Code Issues Projects Releases Wiki Activity

ppc64le: address review comments

Browse Source 
runtime-rs/Makefile: narrow the ppc64le initrd sed to only target
configuration-qemu-runtime-rs.toml (via CONFIG_PATH_QEMU) instead
of globbing all *.toml files in the install directory, which was
an overreach affecting configs that ppc64le does not support.

ci.yaml: fix containerd_version for the qemu-runtime-rs ppc64le
CRI test matrix entry from 'active' to 'latest', consistent with
all other ppc64le/s390x entries.

Signed-off-by: shwetha-s-poojary <shwetha.s-poojary@ibm.com>
This commit is contained in:
shwetha-s-poojary
2026-08-05 16:49:02 +05:30
committed by Amulyam24
parent d057e58081
commit a8eb866b91
2 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yaml vendored
View File

@@ -548,7 +548,7 @@ jobs:
matrix:
params: [
{containerd_version: latest, vmm: qemu},
{ containerd_version: active, vmm: qemu-runtime-rs },
{containerd_version: latest, vmm: qemu-runtime-rs},
]
concurrency:
group: ${{ github.workflow }}-${{ github.job }}-${{ github.event.pull_request.number || github.ref }}-cri-ppc64le-${{ toJSON(matrix) }}

5
src/runtime-rs/Makefile
View File

@@ -1172,9 +1172,8 @@ install-configs: $(CONFIGS)
$(foreach f,$(CONFIGS),$(call INSTALL_FILE,$f,$(dir $(CONFIG_PATH)))) \
ln -sf $(DEFAULT_HYPERVISOR_CONFIG) $(DESTDIR)/$(CONFIG_PATH)
ifeq ($(ARCH),powerpc64le)
for f in $(DESTDIR)$(dir $(CONFIG_PATH))*.toml; do \
[ -f "$$f" ] && sed -i 's|^image = .*|initrd = "$(PREFIX)/share/kata-containers/kata-containers-initrd.img"|' "$$f"; \
done
sed -i 's|^image = .*|initrd = "$(PREFIX)/share/kata-containers/kata-containers-initrd.img"|' \
$(DESTDIR)$(CONFIG_PATH_QEMU)
endif
.PHONY: \