github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2026-07-10 07:05:51 +00:00
Code Issues Projects Releases Wiki Activity

ci: simplify blockfile setup and remove fc required tests

Browse Source 
Address review feedback from PR #13149:

- Replace `dd` with `truncate -s 512M` for the blockfile to create
  a sparse image instead of writing 500MB of zeros
- Remove `_configure_fc_shared_fs` function and its call, as the
  Firecracker configuration should already have `shared_fs = "none"`;
  if it doesn't, that's a separate bug to fix
- Remove `recreate_scratch = true` from blockfile_tomlq_filter,
  as the scratch file is created beforehand and doesn't need
  recreation
- Remove all fc-related entries from required-tests.yaml; new tests
  should run for a few days after merge before being marked required

Signed-off-by: marvelshan <reborn7875@gmail.com>
This commit is contained in:
marvelshan
2026-06-05 01:03:03 +00:00
committed by Fabiano Fidêncio
parent 516d62d717
commit 85e4fb9505
2 changed files with 1 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
tests/integration/kubernetes/gha-run.sh
View File

@@ -134,31 +134,10 @@ function _verify_devmapper() {
function _setup_blockfile_device() {
sudo mkdir -p /opt/containerd
sudo dd if=/dev/zero of=/opt/containerd/blockfile bs=1M count=500
sudo truncate -s 512M /opt/containerd/blockfile
sudo mkfs.ext4 /opt/containerd/blockfile
}
function _configure_fc_shared_fs() {
if is_firecracker_hypervisor; then
local fc_config=""
for candidate in \
"/opt/kata/share/defaults/kata-containers/runtimes/fc/configuration-fc.toml" \
"/opt/kata/share/defaults/kata-containers/configuration-fc.toml" \
"/etc/kata-containers/configuration-fc.toml"; do
if [[ -f "${candidate}" ]]; then
fc_config="${candidate}"
break
fi
done
if [[ -z "${fc_config}" ]]; then
warn "FC kata config not found, shared_fs unchanged"
return 0
fi
info "Setting shared_fs=none in ${fc_config}"
sudo sed -i 's/^#\?shared_fs.*/shared_fs = "none"/' "${fc_config}"
fi
}
# shellcheck disable=SC2016
readonly devmapper_tomlq_filter='
.plugins["io.containerd.snapshotter.v1.devmapper"].pool_name = "contd-thin-pool"
@@ -178,7 +157,6 @@ readonly blockfile_tomlq_filter='
| .plugins["io.containerd.snapshotter.v1.blockfile"].scratch_file = "/opt/containerd/blockfile"
| .plugins["io.containerd.snapshotter.v1.blockfile"].fs_type = "ext4"
| .plugins["io.containerd.snapshotter.v1.blockfile"].mount_options = []
| .plugins["io.containerd.snapshotter.v1.blockfile"].recreate_scratch = true
| .plugins["io.containerd.transfer.v1.local"].unpack_config =
[((.plugins["io.containerd.transfer.v1.local"].unpack_config[0] // {}) + {platform: $platform, snapshotter: "blockfile"})]
| if .version == 3 then
@@ -200,7 +178,6 @@ function configure_snapshotter() {
blockfile)
_setup_blockfile_device
_configure_containerd_snapshotter "blockfile" "${blockfile_tomlq_filter}"
_configure_fc_shared_fs
;;
*) >&2 echo "${SNAPSHOTTER} flavour is not supported"; exit 2 ;;
esac

6
tools/testing/gatekeeper/required-tests.yaml
View File

@@ -49,19 +49,16 @@ mapping:
- Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (active, dragonball)
- Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (active, qemu)
- Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (active, qemu-runtime-rs)
- Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (active, fc)
- Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (lts, clh)
- Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (lts, clh-runtime-rs)
- Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (lts, dragonball)
- Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (lts, qemu)
- Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (lts, qemu-runtime-rs)
- Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-containerd-stability (lts, fc)
- Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-kata-agent-apis
- Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-nerdctl-tests (clh-runtime-rs)
- Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-nerdctl-tests (dragonball)
- Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-nerdctl-tests (qemu)
- Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-nerdctl-tests (qemu-runtime-rs)
- Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-nerdctl-tests (fc)
- Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-nydus (active, clh)
- Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-nydus (active, dragonball)
- Kata Containers CI / kata-containers-ci-on-push / run-basic-amd64-tests / run-nydus (active, qemu)
@@ -73,13 +70,11 @@ mapping:
- Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-tests-amd64 (active, dragonball) / run-cri-containerd-amd64 (active, dragonball)
- Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-tests-amd64 (active, qemu-runtime-rs) / run-cri-containerd-amd64 (active, qemu-runtime-rs)
- Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-tests-amd64 (active, qemu) / run-cri-containerd-amd64 (active, qemu)
- Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-tests-amd64 (active, fc) / run-cri-containerd-amd64 (active, fc)
- Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-tests-amd64 (lts, clh) / run-cri-containerd-amd64 (lts, clh)
- Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-tests-amd64 (lts, clh-runtime-rs) / run-cri-containerd-amd64 (lts, clh-runtime-rs)
- Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-tests-amd64 (lts, dragonball) / run-cri-containerd-amd64 (lts, dragonball)
- Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-tests-amd64 (lts, qemu-runtime-rs) / run-cri-containerd-amd64 (lts, qemu-runtime-rs)
- Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-tests-amd64 (lts, qemu) / run-cri-containerd-amd64 (lts, qemu)
- Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-tests-amd64 (lts, fc) / run-cri-containerd-amd64 (lts, fc)
- Kata Containers CI / kata-containers-ci-on-push / run-cri-containerd-tests-s390x (active, qemu) / run-cri-containerd-s390x (active, qemu)
#- Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-arm64 / run-k8s-tests-on-arm64 (qemu, kubeadm)
- Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-aks / run-k8s-tests (cbl-mariner, clh-azure, normal)
@@ -97,7 +92,6 @@ mapping:
- Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-free-runner / run-k8s-tests (qemu-runtime-rs, active)
- Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-free-runner / run-k8s-tests (clh-runtime-rs, lts)
- Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-free-runner / run-k8s-tests (clh-runtime-rs, active)
- Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-free-runner / run-k8s-tests (fc, active, blockfile)
- Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-zvsi / run-k8s-tests (devmapper, qemu, kubeadm)
- Kata Containers CI / kata-containers-ci-on-push / run-k8s-tests-on-zvsi / run-k8s-tests (nydus, qemu-coco-dev, kubeadm)
- Kata Containers CI / kata-containers-ci-on-push / run-kata-coco-tests / run-k8s-tests-on-tee (sev-snp, qemu-snp)