From 5af7c526ecbb430c4aedee04f676d6017b4edb30 Mon Sep 17 00:00:00 2001 From: Tonis Tiigi Date: Sun, 24 Oct 2021 23:03:08 -0700 Subject: [PATCH 1/4] init: add support for cgroupv2 Signed-off-by: Tonis Tiigi --- pkg/init/cmd/rc.init/main.go | 46 +++++++++++++++++++++++++----------- 1 file changed, 32 insertions(+), 14 deletions(-) diff --git a/pkg/init/cmd/rc.init/main.go b/pkg/init/cmd/rc.init/main.go index a4fd27e51..ec71693b8 100644 --- a/pkg/init/cmd/rc.init/main.go +++ b/pkg/init/cmd/rc.init/main.go @@ -227,22 +227,26 @@ func doMounts() { // misc /proc mounted fs mountSilent("binfmt_misc", "/proc/sys/fs/binfmt_misc", "binfmt_misc", noexec|nosuid|nodev, "") - // mount cgroup root tmpfs - mount("cgroup_root", "/sys/fs/cgroup", "tmpfs", nodev|noexec|nosuid, "mode=755,size=10m") - // mount cgroups filesystems for all enabled cgroups - for _, cg := range cgroupList() { - path := filepath.Join("/sys/fs/cgroup", cg) - mkdir(path, 0555) - mount(cg, path, "cgroup", noexec|nosuid|nodev, cg) + if isCgroupV2() { + mount("cgroup2", "/sys/fs/cgroup", "cgroup2", noexec|nosuid|nodev, "") + } else { + // mount cgroup root tmpfs + mount("cgroup_root", "/sys/fs/cgroup", "tmpfs", nodev|noexec|nosuid, "mode=755,size=10m") + // mount cgroups filesystems for all enabled cgroups + for _, cg := range cgroupList() { + path := filepath.Join("/sys/fs/cgroup", cg) + mkdir(path, 0555) + mount(cg, path, "cgroup", noexec|nosuid|nodev, cg) + } + + // use hierarchy for memory + write("/sys/fs/cgroup/memory/memory.use_hierarchy", "1") + + // many things assume systemd + mkdir("/sys/fs/cgroup/systemd", 0555) + mount("cgroup", "/sys/fs/cgroup/systemd", "cgroup", 0, "none,name=systemd") } - // use hierarchy for memory - write("/sys/fs/cgroup/memory/memory.use_hierarchy", "1") - - // many things assume systemd - mkdir("/sys/fs/cgroup/systemd", 0555) - mount("cgroup", "/sys/fs/cgroup/systemd", "cgroup", 0, "none,name=systemd") - // make / rshared mount("", "/", "", rec|shared, "") } @@ -421,6 +425,20 @@ func doShutdown(action string) { os.Exit(0) } +func isCgroupV2() bool { + dt, err := os.ReadFile("/proc/cmdline") + if err != nil { + log.Printf("error reading /proc/cmdline: %v", err) + return false + } + for _, s := range strings.Split(string(dt), " ") { + if s == "linuxkit.unified_cgroup_hierarchy=1" { + return true + } + } + return false +} + func main() { if filepath.Base(os.Args[0]) == "rc.shutdown" { action := "poweroff" From e8f8a409e83900f8b984497b692d07071b77bf82 Mon Sep 17 00:00:00 2001 From: David Scott Date: Tue, 26 Oct 2021 19:52:22 +0100 Subject: [PATCH 2/4] Update hashes for pkg/init Signed-off-by: David Scott --- examples/addbinds.yml | 2 +- examples/cadvisor.yml | 2 +- examples/dm-crypt-loop.yml | 2 +- examples/dm-crypt.yml | 2 +- examples/docker-for-mac.yml | 2 +- examples/docker.yml | 2 +- examples/getty.yml | 2 +- examples/hostmount-writeable-overlay.yml | 2 +- examples/influxdb-os.yml | 2 +- examples/logging.yml | 2 +- examples/minimal.yml | 2 +- examples/node_exporter.yml | 2 +- examples/openstack.yml | 2 +- examples/platform-aws.yml | 2 +- examples/platform-azure.yml | 2 +- examples/platform-gcp.yml | 2 +- examples/platform-hetzner.yml | 2 +- examples/platform-packet.yml | 2 +- examples/platform-rt-for-vmware.yml | 2 +- examples/platform-scaleway.yml | 2 +- examples/platform-vmware.yml | 2 +- examples/platform-vultr.yml | 2 +- examples/redis-os.yml | 2 +- examples/sshd.yml | 2 +- examples/static-ip.yml | 2 +- examples/swap.yml | 2 +- examples/tpm.yml | 2 +- examples/vpnkit-forwarder.yml | 2 +- examples/vsudd-containerd.yml | 2 +- examples/wireguard.yml | 2 +- linuxkit.yml | 2 +- projects/clear-containers/clear-containers.yml | 2 +- projects/compose/compose-dynamic.yml | 2 +- projects/compose/compose-static.yml | 2 +- projects/ima-namespace/ima-namespace.yml | 2 +- projects/landlock/landlock.yml | 2 +- projects/memorizer/memorizer.yml | 2 +- projects/miragesdk/examples/fdd.yml | 2 +- projects/miragesdk/examples/mirage-dhcp.yml | 2 +- projects/okernel/examples/okernel_simple.yaml | 2 +- projects/shiftfs/shiftfs.yml | 2 +- src/cmd/linuxkit/moby/linuxkit.go | 2 +- test/cases/000_build/000_formats/test.yml | 2 +- test/cases/000_build/010_reproducible/test.yml | 2 +- test/cases/000_build/020_binds/test.yml | 2 +- .../cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml | 2 +- .../010_platforms/000_qemu/005_run_kernel+squashfs/test.yml | 2 +- test/cases/010_platforms/000_qemu/010_run_iso/test.yml | 2 +- test/cases/010_platforms/000_qemu/020_run_efi/test.yml | 2 +- test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml | 2 +- test/cases/010_platforms/000_qemu/050_run_aws/test.yml | 2 +- test/cases/010_platforms/000_qemu/100_container/test.yml | 2 +- .../010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml | 2 +- .../010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml | 2 +- test/cases/010_platforms/010_hyperkit/010_acpi/test.yml | 2 +- test/cases/010_platforms/110_gcp/000_run/test.yml | 2 +- test/cases/020_kernel/011_config_5.4.x/test.yml | 2 +- test/cases/020_kernel/013_config_5.10.x/test.yml | 2 +- test/cases/020_kernel/015_config_5.12.x/test.yml | 2 +- test/cases/020_kernel/111_kmod_5.4.x/test.yml | 2 +- test/cases/020_kernel/113_kmod_5.10.x/test.yml | 2 +- test/cases/020_kernel/115_kmod_5.12.x/test.yml | 2 +- test/cases/020_kernel/200_namespace/common.yml | 2 +- test/cases/030_security/000_docker-bench/test.yml | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test.yml | 2 +- test/cases/040_packages/002_bpftrace/test.yml | 2 +- test/cases/040_packages/003_ca-certificates/test.yml | 2 +- test/cases/040_packages/003_containerd/test.yml | 2 +- test/cases/040_packages/004_dhcpcd/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/000_simple/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/001_luks/test.yml | 2 +- test/cases/040_packages/004_dm-crypt/002_key/test.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test-create.yml | 2 +- test/cases/040_packages/005_extend/000_ext4/test.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/001_btrfs/test.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test-create.yml | 2 +- test/cases/040_packages/005_extend/002_xfs/test.yml | 2 +- test/cases/040_packages/005_extend/003_gpt/test-create.yml | 2 +- test/cases/040_packages/005_extend/003_gpt/test.yml | 2 +- test/cases/040_packages/006_format_mount/000_auto/test.yml | 2 +- test/cases/040_packages/006_format_mount/001_by_label/test.yml | 2 +- .../cases/040_packages/006_format_mount/002_by_name/test.yml.in | 2 +- test/cases/040_packages/006_format_mount/003_btrfs/test.yml | 2 +- test/cases/040_packages/006_format_mount/004_xfs/test.yml | 2 +- .../040_packages/006_format_mount/005_by_device_force/test.yml | 2 +- test/cases/040_packages/006_format_mount/006_gpt/test.yml | 2 +- test/cases/040_packages/006_format_mount/010_multiple/test.yml | 2 +- test/cases/040_packages/007_getty-containerd/test.yml | 2 +- test/cases/040_packages/008_metadata/000_cidata/test.yml | 2 +- test/cases/040_packages/012_losetup/test.yml | 2 +- test/cases/040_packages/013_mkimage/mkimage.yml | 2 +- test/cases/040_packages/013_mkimage/run.yml | 2 +- test/cases/040_packages/019_sysctl/test.yml | 2 +- test/cases/040_packages/020_init_containerd/test.yml | 2 +- test/cases/040_packages/023_wireguard/test.yml | 2 +- test/cases/040_packages/030_logwrite/test.yml | 2 +- test/cases/040_packages/031_kmsg/test.yml | 2 +- test/cases/040_packages/032_bcc/test.yml | 2 +- test/hack/test-ltp.yml | 2 +- test/hack/test.yml | 2 +- test/pkg/ns/template.yml | 2 +- 104 files changed, 104 insertions(+), 104 deletions(-) diff --git a/examples/addbinds.yml b/examples/addbinds.yml index 625d42f06..991c2370d 100644 --- a/examples/addbinds.yml +++ b/examples/addbinds.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/cadvisor.yml b/examples/cadvisor.yml index c455af552..65864105a 100644 --- a/examples/cadvisor.yml +++ b/examples/cadvisor.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/dm-crypt-loop.yml b/examples/dm-crypt-loop.yml index 8d2b6a766..b210ff8c7 100644 --- a/examples/dm-crypt-loop.yml +++ b/examples/dm-crypt-loop.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/dm-crypt.yml b/examples/dm-crypt.yml index e0fac0f02..ff98f8e20 100644 --- a/examples/dm-crypt.yml +++ b/examples/dm-crypt.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/docker-for-mac.yml b/examples/docker-for-mac.yml index 11296a6a8..7188a21e6 100644 --- a/examples/docker-for-mac.yml +++ b/examples/docker-for-mac.yml @@ -4,7 +4,7 @@ kernel: cmdline: "console=ttyS0 page_poison=1" init: - linuxkit/vpnkit-expose-port:b0a5ede4c53aa718b48fb9a86e4725ab6ae7f96e # install vpnkit-expose-port and vpnkit-iptables-wrapper on host - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/docker.yml b/examples/docker.yml index 3cc8a8b94..1b88208c9 100644 --- a/examples/docker.yml +++ b/examples/docker.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/getty.yml b/examples/getty.yml index 669501ffd..c895a1099 100644 --- a/examples/getty.yml +++ b/examples/getty.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/hostmount-writeable-overlay.yml b/examples/hostmount-writeable-overlay.yml index e34e526f2..337f39993 100644 --- a/examples/hostmount-writeable-overlay.yml +++ b/examples/hostmount-writeable-overlay.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/influxdb-os.yml b/examples/influxdb-os.yml index 9277f7699..e6f197ed5 100644 --- a/examples/influxdb-os.yml +++ b/examples/influxdb-os.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/logging.yml b/examples/logging.yml index 28bbe26cd..17e18e23d 100644 --- a/examples/logging.yml +++ b/examples/logging.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/minimal.yml b/examples/minimal.yml index cad352e44..8d122698c 100644 --- a/examples/minimal.yml +++ b/examples/minimal.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 onboot: diff --git a/examples/node_exporter.yml b/examples/node_exporter.yml index 78b59f38e..ccdc474f9 100644 --- a/examples/node_exporter.yml +++ b/examples/node_exporter.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 services: diff --git a/examples/openstack.yml b/examples/openstack.yml index a3f0b695b..661b58c98 100644 --- a/examples/openstack.yml +++ b/examples/openstack.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/platform-aws.yml b/examples/platform-aws.yml index 072aa6087..872236c27 100644 --- a/examples/platform-aws.yml +++ b/examples/platform-aws.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/platform-azure.yml b/examples/platform-azure.yml index 6bb7de308..f9a5464b0 100644 --- a/examples/platform-azure.yml +++ b/examples/platform-azure.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/platform-gcp.yml b/examples/platform-gcp.yml index 47df77ab0..8e0013e82 100644 --- a/examples/platform-gcp.yml +++ b/examples/platform-gcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/platform-hetzner.yml b/examples/platform-hetzner.yml index becf82137..806c7fc6f 100644 --- a/examples/platform-hetzner.yml +++ b/examples/platform-hetzner.yml @@ -3,7 +3,7 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/platform-packet.yml b/examples/platform-packet.yml index 77a25669b..e2b7c4473 100644 --- a/examples/platform-packet.yml +++ b/examples/platform-packet.yml @@ -3,7 +3,7 @@ kernel: cmdline: console=ttyS1 ucode: intel-ucode.cpio init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/platform-rt-for-vmware.yml b/examples/platform-rt-for-vmware.yml index 16ec75721..e1d7d0d1d 100644 --- a/examples/platform-rt-for-vmware.yml +++ b/examples/platform-rt-for-vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.11.4-rt cmdline: "console=tty0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/platform-scaleway.yml b/examples/platform-scaleway.yml index 081776659..eea021acc 100644 --- a/examples/platform-scaleway.yml +++ b/examples/platform-scaleway.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0 root=/dev/vda" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/platform-vmware.yml b/examples/platform-vmware.yml index 0c139a9cc..a9956190c 100644 --- a/examples/platform-vmware.yml +++ b/examples/platform-vmware.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=tty0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/platform-vultr.yml b/examples/platform-vultr.yml index 6c2e7dad5..24feb2041 100644 --- a/examples/platform-vultr.yml +++ b/examples/platform-vultr.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/redis-os.yml b/examples/redis-os.yml index e4c846409..d49960269 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 onboot: diff --git a/examples/sshd.yml b/examples/sshd.yml index 65109ad4d..ffb8f1c4b 100644 --- a/examples/sshd.yml +++ b/examples/sshd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/static-ip.yml b/examples/static-ip.yml index 3f84d7dbe..109d2caa1 100644 --- a/examples/static-ip.yml +++ b/examples/static-ip.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 onboot: diff --git a/examples/swap.yml b/examples/swap.yml index bb33de347..081028bef 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0 console=ttysclp0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/tpm.yml b/examples/tpm.yml index e3e250cf8..36446fbae 100644 --- a/examples/tpm.yml +++ b/examples/tpm.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=tty0 console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 7c2747fa9..428ccb0a4 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 onboot: diff --git a/examples/vsudd-containerd.yml b/examples/vsudd-containerd.yml index 227741e27..35de6a52a 100644 --- a/examples/vsudd-containerd.yml +++ b/examples/vsudd-containerd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 onboot: diff --git a/examples/wireguard.yml b/examples/wireguard.yml index 6a3391220..076b350a3 100644 --- a/examples/wireguard.yml +++ b/examples/wireguard.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/linuxkit.yml b/linuxkit.yml index 80888040b..dc84f32a6 100644 --- a/linuxkit.yml +++ b/linuxkit.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=tty0 console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/projects/clear-containers/clear-containers.yml b/projects/clear-containers/clear-containers.yml index 9dc0de095..9f4289e29 100644 --- a/projects/clear-containers/clear-containers.yml +++ b/projects/clear-containers/clear-containers.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel-clear-containers:4.9.x cmdline: "root=/dev/pmem0p1 rootflags=dax,data=ordered,errors=remount-ro rw rootfstype=ext4 tsc=reliable no_timer_check rcupdate.rcu_expedited=1 i8042.direct=1 i8042.dumbkbd=1 i8042.nopnp=1 i8042.noaux=1 noreplace-smp reboot=k panic=1 console=hvc0 console=hvc1 initcall_debug iommu=off quiet cryptomgr.notests page_poison=on" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de onboot: - name: sysctl image: mobylinux/sysctl:2cf2f9d5b4d314ba1bfc22b2fe931924af666d8c diff --git a/projects/compose/compose-dynamic.yml b/projects/compose/compose-dynamic.yml index 66d10e3c1..6a8a9152b 100644 --- a/projects/compose/compose-dynamic.yml +++ b/projects/compose/compose-dynamic.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/projects/compose/compose-static.yml b/projects/compose/compose-static.yml index 370e51a2c..3b59f6b30 100644 --- a/projects/compose/compose-static.yml +++ b/projects/compose/compose-static.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/projects/ima-namespace/ima-namespace.yml b/projects/ima-namespace/ima-namespace.yml index a84722a3e..612028df4 100644 --- a/projects/ima-namespace/ima-namespace.yml +++ b/projects/ima-namespace/ima-namespace.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel-ima:4.11.1-186dd3605ee7b23214850142f8f02b4679dbd148 cmdline: "console=ttyS0 console=tty0 page_poison=1 ima_appraise=enforce_ns" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/projects/landlock/landlock.yml b/projects/landlock/landlock.yml index a9dbd23d9..be7acf66f 100644 --- a/projects/landlock/landlock.yml +++ b/projects/landlock/landlock.yml @@ -2,7 +2,7 @@ kernel: image: mobylinux/kernel-landlock:4.9.x cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - mobylinux/runc:b0fb122e10dbb7e4e45115177a61a3f8d68c19a9 - mobylinux/containerd:18eaf72f3f4f9a9f29ca1951f66df701f873060b - mobylinux/ca-certificates:eabc5a6e59f05aa91529d80e9a595b85b046f935 diff --git a/projects/memorizer/memorizer.yml b/projects/memorizer/memorizer.yml index 9a3901c23..a20e4e088 100644 --- a/projects/memorizer/memorizer.yml +++ b/projects/memorizer/memorizer.yml @@ -2,7 +2,7 @@ kernel: image: "linuxkitprojects/kernel-memorizer:4.10_dbg" cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 onboot: diff --git a/projects/miragesdk/examples/fdd.yml b/projects/miragesdk/examples/fdd.yml index 35f06aa7a..87bf0a9d5 100644 --- a/projects/miragesdk/examples/fdd.yml +++ b/projects/miragesdk/examples/fdd.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:4.9.34 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/projects/miragesdk/examples/mirage-dhcp.yml b/projects/miragesdk/examples/mirage-dhcp.yml index 10fd874ee..33518119c 100644 --- a/projects/miragesdk/examples/mirage-dhcp.yml +++ b/projects/miragesdk/examples/mirage-dhcp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 onboot: diff --git a/projects/okernel/examples/okernel_simple.yaml b/projects/okernel/examples/okernel_simple.yaml index cbb471f77..85e6d0176 100644 --- a/projects/okernel/examples/okernel_simple.yaml +++ b/projects/okernel/examples/okernel_simple.yaml @@ -2,7 +2,7 @@ kernel: image: okernel:latest cmdline: "console=tty0 page_poison=1" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/projects/shiftfs/shiftfs.yml b/projects/shiftfs/shiftfs.yml index 72a616c51..b7ddbf350 100644 --- a/projects/shiftfs/shiftfs.yml +++ b/projects/shiftfs/shiftfs.yml @@ -2,7 +2,7 @@ kernel: image: linuxkitprojects/kernel-shiftfs:4.11.4-881a041fc14bd95814cf140b5e98d97dd65160b5 cmdline: "console=ttyS0 console=tty0 page_poison=1" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/src/cmd/linuxkit/moby/linuxkit.go b/src/cmd/linuxkit/moby/linuxkit.go index 95827c816..8906ece85 100644 --- a/src/cmd/linuxkit/moby/linuxkit.go +++ b/src/cmd/linuxkit/moby/linuxkit.go @@ -18,7 +18,7 @@ kernel: image: linuxkit/kernel:4.9.39 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: mkimage diff --git a/test/cases/000_build/000_formats/test.yml b/test/cases/000_build/000_formats/test.yml index 983389391..56de3edee 100644 --- a/test/cases/000_build/000_formats/test.yml +++ b/test/cases/000_build/000_formats/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: dhcpcd diff --git a/test/cases/000_build/010_reproducible/test.yml b/test/cases/000_build/010_reproducible/test.yml index 28c6c9d24..c2beffe40 100644 --- a/test/cases/000_build/010_reproducible/test.yml +++ b/test/cases/000_build/010_reproducible/test.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 diff --git a/test/cases/000_build/020_binds/test.yml b/test/cases/000_build/020_binds/test.yml index d5a23531a..eebadb2ff 100644 --- a/test/cases/000_build/020_binds/test.yml +++ b/test/cases/000_build/020_binds/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.30 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: mount diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml index ef6a5cf8e..a73f5bbcf 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel+initrd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml index ef6a5cf8e..a73f5bbcf 100644 --- a/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/000_qemu/005_run_kernel+squashfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml index 71834576b..35556088d 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.yml +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml index 254b50ae6..f3b936cd3 100644 --- a/test/cases/010_platforms/000_qemu/020_run_efi/test.yml +++ b/test/cases/010_platforms/000_qemu/020_run_efi/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml index 254b50ae6..f3b936cd3 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml index 254b50ae6..f3b936cd3 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml index 254b50ae6..f3b936cd3 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.yml +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff diff --git a/test/cases/010_platforms/000_qemu/100_container/test.yml b/test/cases/010_platforms/000_qemu/100_container/test.yml index c9814821c..2a95167e6 100644 --- a/test/cases/010_platforms/000_qemu/100_container/test.yml +++ b/test/cases/010_platforms/000_qemu/100_container/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml index 254b50ae6..f3b936cd3 100644 --- a/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml +++ b/test/cases/010_platforms/010_hyperkit/000_run_kernel+initrd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml index 254b50ae6..f3b936cd3 100644 --- a/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml +++ b/test/cases/010_platforms/010_hyperkit/005_run_kernel+squashfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff diff --git a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml index 681c6169c..76fb8bfa9 100644 --- a/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml +++ b/test/cases/010_platforms/010_hyperkit/010_acpi/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 services: diff --git a/test/cases/010_platforms/110_gcp/000_run/test.yml b/test/cases/010_platforms/110_gcp/000_run/test.yml index 254b50ae6..f3b936cd3 100644 --- a/test/cases/010_platforms/110_gcp/000_run/test.yml +++ b/test/cases/010_platforms/110_gcp/000_run/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff diff --git a/test/cases/020_kernel/011_config_5.4.x/test.yml b/test/cases/020_kernel/011_config_5.4.x/test.yml index 847113dbc..1ee80ac70 100644 --- a/test/cases/020_kernel/011_config_5.4.x/test.yml +++ b/test/cases/020_kernel/011_config_5.4.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.129 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/013_config_5.10.x/test.yml b/test/cases/020_kernel/013_config_5.10.x/test.yml index 3135cd176..6ce3e5e97 100644 --- a/test/cases/020_kernel/013_config_5.10.x/test.yml +++ b/test/cases/020_kernel/013_config_5.10.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/015_config_5.12.x/test.yml b/test/cases/020_kernel/015_config_5.12.x/test.yml index ec566586d..618988187 100644 --- a/test/cases/020_kernel/015_config_5.12.x/test.yml +++ b/test/cases/020_kernel/015_config_5.12.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.12.14 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: check-kernel-config diff --git a/test/cases/020_kernel/111_kmod_5.4.x/test.yml b/test/cases/020_kernel/111_kmod_5.4.x/test.yml index 05d7302a9..f7de208a4 100644 --- a/test/cases/020_kernel/111_kmod_5.4.x/test.yml +++ b/test/cases/020_kernel/111_kmod_5.4.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.4.129 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: check diff --git a/test/cases/020_kernel/113_kmod_5.10.x/test.yml b/test/cases/020_kernel/113_kmod_5.10.x/test.yml index 9c3dd1f86..b6f8130fd 100644 --- a/test/cases/020_kernel/113_kmod_5.10.x/test.yml +++ b/test/cases/020_kernel/113_kmod_5.10.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: check diff --git a/test/cases/020_kernel/115_kmod_5.12.x/test.yml b/test/cases/020_kernel/115_kmod_5.12.x/test.yml index 3b68e75cf..16acd5678 100644 --- a/test/cases/020_kernel/115_kmod_5.12.x/test.yml +++ b/test/cases/020_kernel/115_kmod_5.12.x/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.12.14 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: check diff --git a/test/cases/020_kernel/200_namespace/common.yml b/test/cases/020_kernel/200_namespace/common.yml index c2c7ed2fc..8fc9b4586 100644 --- a/test/cases/020_kernel/200_namespace/common.yml +++ b/test/cases/020_kernel/200_namespace/common.yml @@ -2,5 +2,5 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 diff --git a/test/cases/030_security/000_docker-bench/test.yml b/test/cases/030_security/000_docker-bench/test.yml index 7ee6a1bd8..794b817f2 100644 --- a/test/cases/030_security/000_docker-bench/test.yml +++ b/test/cases/030_security/000_docker-bench/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index 7887d7ee3..d58b90849 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 page_poison=1" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: test diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 5eb66e805..cd9d515ef 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: binfmt diff --git a/test/cases/040_packages/002_bpftrace/test.yml b/test/cases/040_packages/002_bpftrace/test.yml index 5066aa76c..521e8f76b 100644 --- a/test/cases/040_packages/002_bpftrace/test.yml +++ b/test/cases/040_packages/002_bpftrace/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/bpftrace:a5c57a3791a87e96aea456f78fd88973ea9904d0 onboot: diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 72749a14b..6ae05790a 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a onboot: diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index a4c00b644..0636ce416 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 4f96df40d..28346eb6a 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: dhcpcd diff --git a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml index 184ae6aee..c1c1c6834 100644 --- a/test/cases/040_packages/004_dm-crypt/000_simple/test.yml +++ b/test/cases/040_packages/004_dm-crypt/000_simple/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: dm-crypt diff --git a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml index bc99328da..0ea91cbfb 100644 --- a/test/cases/040_packages/004_dm-crypt/001_luks/test.yml +++ b/test/cases/040_packages/004_dm-crypt/001_luks/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: dm-crypt diff --git a/test/cases/040_packages/004_dm-crypt/002_key/test.yml b/test/cases/040_packages/004_dm-crypt/002_key/test.yml index ee1d28c7e..c4861e1d0 100644 --- a/test/cases/040_packages/004_dm-crypt/002_key/test.yml +++ b/test/cases/040_packages/004_dm-crypt/002_key/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: dm-crypt diff --git a/test/cases/040_packages/005_extend/000_ext4/test-create.yml b/test/cases/040_packages/005_extend/000_ext4/test-create.yml index 5892fa852..15536895b 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test-create.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format diff --git a/test/cases/040_packages/005_extend/000_ext4/test.yml b/test/cases/040_packages/005_extend/000_ext4/test.yml index 9028d63f6..c4db2ba43 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: extend diff --git a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml index 90b47a347..dcf7d56cf 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test-create.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: modprobe diff --git a/test/cases/040_packages/005_extend/001_btrfs/test.yml b/test/cases/040_packages/005_extend/001_btrfs/test.yml index dec3782cf..8e7c99479 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: modprobe diff --git a/test/cases/040_packages/005_extend/002_xfs/test-create.yml b/test/cases/040_packages/005_extend/002_xfs/test-create.yml index 9e2d110ba..29ad581f0 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test-create.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format diff --git a/test/cases/040_packages/005_extend/002_xfs/test.yml b/test/cases/040_packages/005_extend/002_xfs/test.yml index 9d62d1dab..cea2de92e 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: extend diff --git a/test/cases/040_packages/005_extend/003_gpt/test-create.yml b/test/cases/040_packages/005_extend/003_gpt/test-create.yml index 04ac40354..9fd3de094 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test-create.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test-create.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format diff --git a/test/cases/040_packages/005_extend/003_gpt/test.yml b/test/cases/040_packages/005_extend/003_gpt/test.yml index 9028d63f6..c4db2ba43 100644 --- a/test/cases/040_packages/005_extend/003_gpt/test.yml +++ b/test/cases/040_packages/005_extend/003_gpt/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: extend diff --git a/test/cases/040_packages/006_format_mount/000_auto/test.yml b/test/cases/040_packages/006_format_mount/000_auto/test.yml index 7a6b58d2c..33879f73a 100644 --- a/test/cases/040_packages/006_format_mount/000_auto/test.yml +++ b/test/cases/040_packages/006_format_mount/000_auto/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/001_by_label/test.yml b/test/cases/040_packages/006_format_mount/001_by_label/test.yml index d33683075..e1c53d959 100644 --- a/test/cases/040_packages/006_format_mount/001_by_label/test.yml +++ b/test/cases/040_packages/006_format_mount/001_by_label/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in index 02edf4d8e..759ac4bb5 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.yml.in @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml index a77c8d683..ea10fc8dc 100644 --- a/test/cases/040_packages/006_format_mount/003_btrfs/test.yml +++ b/test/cases/040_packages/006_format_mount/003_btrfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: modprobe diff --git a/test/cases/040_packages/006_format_mount/004_xfs/test.yml b/test/cases/040_packages/006_format_mount/004_xfs/test.yml index c21a23c84..840e14b60 100644 --- a/test/cases/040_packages/006_format_mount/004_xfs/test.yml +++ b/test/cases/040_packages/006_format_mount/004_xfs/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml index 45fa95e50..18707409d 100644 --- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml +++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/006_gpt/test.yml b/test/cases/040_packages/006_format_mount/006_gpt/test.yml index aeb973e8c..0758e393b 100644 --- a/test/cases/040_packages/006_format_mount/006_gpt/test.yml +++ b/test/cases/040_packages/006_format_mount/006_gpt/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format diff --git a/test/cases/040_packages/006_format_mount/010_multiple/test.yml b/test/cases/040_packages/006_format_mount/010_multiple/test.yml index fa8849784..8fa9cb613 100644 --- a/test/cases/040_packages/006_format_mount/010_multiple/test.yml +++ b/test/cases/040_packages/006_format_mount/010_multiple/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: format diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 4c35d49e2..11c625c89 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/test/cases/040_packages/008_metadata/000_cidata/test.yml b/test/cases/040_packages/008_metadata/000_cidata/test.yml index f961f7ccb..b54dabc49 100644 --- a/test/cases/040_packages/008_metadata/000_cidata/test.yml +++ b/test/cases/040_packages/008_metadata/000_cidata/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: metadata diff --git a/test/cases/040_packages/012_losetup/test.yml b/test/cases/040_packages/012_losetup/test.yml index ffb025987..9b3c00f12 100644 --- a/test/cases/040_packages/012_losetup/test.yml +++ b/test/cases/040_packages/012_losetup/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: losetup diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 73e31f280..d8d344db3 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: mkimage diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index 3749966c8..92c0659de 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: poweroff diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index 521b50e33..6ecbc333b 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: sysctl diff --git a/test/cases/040_packages/020_init_containerd/test.yml b/test/cases/040_packages/020_init_containerd/test.yml index 2bd8e5fa2..ee6b23677 100644 --- a/test/cases/040_packages/020_init_containerd/test.yml +++ b/test/cases/040_packages/020_init_containerd/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index c3edd8b5a..6d081e0f8 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/test/cases/040_packages/030_logwrite/test.yml b/test/cases/040_packages/030_logwrite/test.yml index a4528aaa5..775549caf 100644 --- a/test/cases/040_packages/030_logwrite/test.yml +++ b/test/cases/040_packages/030_logwrite/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/031_kmsg/test.yml index 2c3a86ae0..a87ca0172 100644 --- a/test/cases/040_packages/031_kmsg/test.yml +++ b/test/cases/040_packages/031_kmsg/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 - linuxkit/ca-certificates:4df823737c9bf6a9564b736f1a19fd25d60e909a diff --git a/test/cases/040_packages/032_bcc/test.yml b/test/cases/040_packages/032_bcc/test.yml index ff5f97e11..0edf34c66 100644 --- a/test/cases/040_packages/032_bcc/test.yml +++ b/test/cases/040_packages/032_bcc/test.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0 console=ttyAMA0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/kernel-bcc:5.4.113 onboot: diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 249bb6599..d66872f39 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -2,7 +2,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 onboot: diff --git a/test/hack/test.yml b/test/hack/test.yml index ff860f67b..bbf1165f0 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -4,7 +4,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 - linuxkit/containerd:b991571dd383351dbb2873f9ae3b70475adb6816 onboot: diff --git a/test/pkg/ns/template.yml b/test/pkg/ns/template.yml index 88bfb7d11..5dd6330ae 100644 --- a/test/pkg/ns/template.yml +++ b/test/pkg/ns/template.yml @@ -3,7 +3,7 @@ kernel: image: linuxkit/kernel:5.10.47 cmdline: "console=ttyS0" init: - - linuxkit/init:78fb57c7da07c4e43c3a37b27755581da087a3b6 + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 onboot: - name: test-ns From 9d16e2a2b928548ed554c6e1ad37ba0837fe5df7 Mon Sep 17 00:00:00 2001 From: David Scott Date: Tue, 26 Oct 2021 19:57:24 +0100 Subject: [PATCH 3/4] test: the README.md says the numbers correspond to the first letter A few of these tests appear to be misnumbered, so renumber them. Signed-off-by: David Scott --- test/cases/040_packages/{032_bcc => 002_bcc}/check.sh | 0 test/cases/040_packages/{032_bcc => 002_bcc}/test.sh | 0 test/cases/040_packages/{032_bcc => 002_bcc}/test.yml | 0 .../{020_init_containerd => 009_init_containerd}/check.sh | 0 .../runtime-config.toml | 0 .../{020_init_containerd => 009_init_containerd}/test.sh | 0 .../{020_init_containerd => 009_init_containerd}/test.yml | 0 test/cases/040_packages/{031_kmsg => 011_kmsg}/check.sh | 0 test/cases/040_packages/{031_kmsg => 011_kmsg}/test.sh | 0 test/cases/040_packages/{031_kmsg => 011_kmsg}/test.yml | 0 test/cases/040_packages/{030_logwrite => 012_logwrite}/check.sh | 0 test/cases/040_packages/{030_logwrite => 012_logwrite}/test.sh | 0 test/cases/040_packages/{030_logwrite => 012_logwrite}/test.yml | 0 .../{008_metadata => 013_metadata}/000_cidata/check.sh | 0 .../{008_metadata => 013_metadata}/000_cidata/geniso.sh | 0 .../{008_metadata => 013_metadata}/000_cidata/test.sh | 0 .../{008_metadata => 013_metadata}/000_cidata/test.yml | 0 17 files changed, 0 insertions(+), 0 deletions(-) rename test/cases/040_packages/{032_bcc => 002_bcc}/check.sh (100%) rename test/cases/040_packages/{032_bcc => 002_bcc}/test.sh (100%) rename test/cases/040_packages/{032_bcc => 002_bcc}/test.yml (100%) rename test/cases/040_packages/{020_init_containerd => 009_init_containerd}/check.sh (100%) rename test/cases/040_packages/{020_init_containerd => 009_init_containerd}/runtime-config.toml (100%) rename test/cases/040_packages/{020_init_containerd => 009_init_containerd}/test.sh (100%) rename test/cases/040_packages/{020_init_containerd => 009_init_containerd}/test.yml (100%) rename test/cases/040_packages/{031_kmsg => 011_kmsg}/check.sh (100%) rename test/cases/040_packages/{031_kmsg => 011_kmsg}/test.sh (100%) rename test/cases/040_packages/{031_kmsg => 011_kmsg}/test.yml (100%) rename test/cases/040_packages/{030_logwrite => 012_logwrite}/check.sh (100%) rename test/cases/040_packages/{030_logwrite => 012_logwrite}/test.sh (100%) rename test/cases/040_packages/{030_logwrite => 012_logwrite}/test.yml (100%) rename test/cases/040_packages/{008_metadata => 013_metadata}/000_cidata/check.sh (100%) rename test/cases/040_packages/{008_metadata => 013_metadata}/000_cidata/geniso.sh (100%) rename test/cases/040_packages/{008_metadata => 013_metadata}/000_cidata/test.sh (100%) rename test/cases/040_packages/{008_metadata => 013_metadata}/000_cidata/test.yml (100%) diff --git a/test/cases/040_packages/032_bcc/check.sh b/test/cases/040_packages/002_bcc/check.sh similarity index 100% rename from test/cases/040_packages/032_bcc/check.sh rename to test/cases/040_packages/002_bcc/check.sh diff --git a/test/cases/040_packages/032_bcc/test.sh b/test/cases/040_packages/002_bcc/test.sh similarity index 100% rename from test/cases/040_packages/032_bcc/test.sh rename to test/cases/040_packages/002_bcc/test.sh diff --git a/test/cases/040_packages/032_bcc/test.yml b/test/cases/040_packages/002_bcc/test.yml similarity index 100% rename from test/cases/040_packages/032_bcc/test.yml rename to test/cases/040_packages/002_bcc/test.yml diff --git a/test/cases/040_packages/020_init_containerd/check.sh b/test/cases/040_packages/009_init_containerd/check.sh similarity index 100% rename from test/cases/040_packages/020_init_containerd/check.sh rename to test/cases/040_packages/009_init_containerd/check.sh diff --git a/test/cases/040_packages/020_init_containerd/runtime-config.toml b/test/cases/040_packages/009_init_containerd/runtime-config.toml similarity index 100% rename from test/cases/040_packages/020_init_containerd/runtime-config.toml rename to test/cases/040_packages/009_init_containerd/runtime-config.toml diff --git a/test/cases/040_packages/020_init_containerd/test.sh b/test/cases/040_packages/009_init_containerd/test.sh similarity index 100% rename from test/cases/040_packages/020_init_containerd/test.sh rename to test/cases/040_packages/009_init_containerd/test.sh diff --git a/test/cases/040_packages/020_init_containerd/test.yml b/test/cases/040_packages/009_init_containerd/test.yml similarity index 100% rename from test/cases/040_packages/020_init_containerd/test.yml rename to test/cases/040_packages/009_init_containerd/test.yml diff --git a/test/cases/040_packages/031_kmsg/check.sh b/test/cases/040_packages/011_kmsg/check.sh similarity index 100% rename from test/cases/040_packages/031_kmsg/check.sh rename to test/cases/040_packages/011_kmsg/check.sh diff --git a/test/cases/040_packages/031_kmsg/test.sh b/test/cases/040_packages/011_kmsg/test.sh similarity index 100% rename from test/cases/040_packages/031_kmsg/test.sh rename to test/cases/040_packages/011_kmsg/test.sh diff --git a/test/cases/040_packages/031_kmsg/test.yml b/test/cases/040_packages/011_kmsg/test.yml similarity index 100% rename from test/cases/040_packages/031_kmsg/test.yml rename to test/cases/040_packages/011_kmsg/test.yml diff --git a/test/cases/040_packages/030_logwrite/check.sh b/test/cases/040_packages/012_logwrite/check.sh similarity index 100% rename from test/cases/040_packages/030_logwrite/check.sh rename to test/cases/040_packages/012_logwrite/check.sh diff --git a/test/cases/040_packages/030_logwrite/test.sh b/test/cases/040_packages/012_logwrite/test.sh similarity index 100% rename from test/cases/040_packages/030_logwrite/test.sh rename to test/cases/040_packages/012_logwrite/test.sh diff --git a/test/cases/040_packages/030_logwrite/test.yml b/test/cases/040_packages/012_logwrite/test.yml similarity index 100% rename from test/cases/040_packages/030_logwrite/test.yml rename to test/cases/040_packages/012_logwrite/test.yml diff --git a/test/cases/040_packages/008_metadata/000_cidata/check.sh b/test/cases/040_packages/013_metadata/000_cidata/check.sh similarity index 100% rename from test/cases/040_packages/008_metadata/000_cidata/check.sh rename to test/cases/040_packages/013_metadata/000_cidata/check.sh diff --git a/test/cases/040_packages/008_metadata/000_cidata/geniso.sh b/test/cases/040_packages/013_metadata/000_cidata/geniso.sh similarity index 100% rename from test/cases/040_packages/008_metadata/000_cidata/geniso.sh rename to test/cases/040_packages/013_metadata/000_cidata/geniso.sh diff --git a/test/cases/040_packages/008_metadata/000_cidata/test.sh b/test/cases/040_packages/013_metadata/000_cidata/test.sh similarity index 100% rename from test/cases/040_packages/008_metadata/000_cidata/test.sh rename to test/cases/040_packages/013_metadata/000_cidata/test.sh diff --git a/test/cases/040_packages/008_metadata/000_cidata/test.yml b/test/cases/040_packages/013_metadata/000_cidata/test.yml similarity index 100% rename from test/cases/040_packages/008_metadata/000_cidata/test.yml rename to test/cases/040_packages/013_metadata/000_cidata/test.yml From 10599f776ab776cca1547ffbd1934d4128f605e4 Mon Sep 17 00:00:00 2001 From: David Scott Date: Tue, 26 Oct 2021 20:07:38 +0100 Subject: [PATCH 4/4] test: add a case for cgroupv2 Signed-off-by: David Scott --- test/cases/040_packages/003_cgroupv2/check.sh | 14 +++++++++++ test/cases/040_packages/003_cgroupv2/test.sh | 24 +++++++++++++++++++ test/cases/040_packages/003_cgroupv2/test.yml | 19 +++++++++++++++ 3 files changed, 57 insertions(+) create mode 100755 test/cases/040_packages/003_cgroupv2/check.sh create mode 100644 test/cases/040_packages/003_cgroupv2/test.sh create mode 100644 test/cases/040_packages/003_cgroupv2/test.yml diff --git a/test/cases/040_packages/003_cgroupv2/check.sh b/test/cases/040_packages/003_cgroupv2/check.sh new file mode 100755 index 000000000..5e7d2cdce --- /dev/null +++ b/test/cases/040_packages/003_cgroupv2/check.sh @@ -0,0 +1,14 @@ +#!/bin/sh + +set -x + +function failed { + printf "cgroup not detected, suite FAILED\n" >&1 + exit 1 +} + +DEVICE=/dev/sdb + +mount | grep cgroup2 || failed + +printf "cgroup2 detected, suite PASSED\n" >&1 diff --git a/test/cases/040_packages/003_cgroupv2/test.sh b/test/cases/040_packages/003_cgroupv2/test.sh new file mode 100644 index 000000000..9c8f4afd4 --- /dev/null +++ b/test/cases/040_packages/003_cgroupv2/test.sh @@ -0,0 +1,24 @@ +#!/bin/sh +# SUMMARY: Run containerd test +# LABELS: +# REPEAT: + +set -e + +# Source libraries. Uncomment if needed/defined +#. "${RT_LIB}" +. "${RT_PROJECT_ROOT}/_lib/lib.sh" + +NAME=cgroupv2 + +clean_up() { + rm -rf ${NAME}-* +} +trap clean_up EXIT + +# Test code goes here +linuxkit build -format kernel+initrd -name "${NAME}" test.yml +RESULT="$(linuxkit run -mem 3072 ${NAME})" +echo "${RESULT}" | grep -q "suite PASSED" + +exit 0 diff --git a/test/cases/040_packages/003_cgroupv2/test.yml b/test/cases/040_packages/003_cgroupv2/test.yml new file mode 100644 index 000000000..b8c39d9d6 --- /dev/null +++ b/test/cases/040_packages/003_cgroupv2/test.yml @@ -0,0 +1,19 @@ +kernel: + image: linuxkit/kernel:5.10.47 + cmdline: "linuxkit.unified_cgroup_hierarchy=1 console=ttyS0 console=ttyAMA0" +init: + - linuxkit/init:43c52456571369d62882605e4d510f0df3ed93de + - linuxkit/runc:5f9941eed05f58293f928c9f2f0b6a3f9f6f55c1 +onboot: + - name: test + image: alpine:3.13 + binds: + - /check.sh:/check.sh + - /run:/run + command: ["sh", "./check.sh"] + - name: poweroff + image: linuxkit/poweroff:afe4b3ab865afe1e3ed5c88e58f57808f4f5119f + command: ["/bin/sh", "/poweroff.sh", "10"] +files: + - path: check.sh + source: ./check.sh