diff --git a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml index 6f9b52459..a372778b5 100644 --- a/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml +++ b/test/cases/010_platforms/000_qemu/000_run_kernel/test.yml @@ -7,12 +7,8 @@ init: - linuxkit/containerd:60e2486a74c665ba4df57e561729aec20758daed onboot: - name: poweroff - image: "linuxkit/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084" - pid: host + image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "10"] - capabilities: - - CAP_SYS_BOOT - readonly: true trust: image: - linuxkit/kernel 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 87c762462..938e911de 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 @@ -7,12 +7,8 @@ init: - linuxkit/containerd:60e2486a74c665ba4df57e561729aec20758daed onboot: - name: poweroff - image: "linuxkit/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084" - pid: host + image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "10"] - capabilities: - - CAP_SYS_BOOT - readonly: true trust: image: - linuxkit/kernel 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 8153330ba..8add0fcbb 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 @@ -7,12 +7,8 @@ init: - linuxkit/containerd:60e2486a74c665ba4df57e561729aec20758daed onboot: - name: poweroff - image: "linuxkit/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084" - pid: host + image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "10"] - capabilities: - - CAP_SYS_BOOT - readonly: true trust: image: - linuxkit/kernel diff --git a/test/cases/020_kernel/000_config/test-kernel-config.yml b/test/cases/020_kernel/000_config/test-kernel-config.yml index 6c5509423..d1c105a3c 100644 --- a/test/cases/020_kernel/000_config/test-kernel-config.yml +++ b/test/cases/020_kernel/000_config/test-kernel-config.yml @@ -22,11 +22,7 @@ onboot: image: "linuxkit/test-kernel-config:ecff41279ccbc408079a3996a956432651c6eb9c" readonly: true - name: poweroff - image: "linuxkit/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084" - pid: host + image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "3"] - capabilities: - - CAP_SYS_BOOT - readonly: true outputs: - format: kernel+initrd diff --git a/test/cases/020_kernel/010_kmod/kmod.yml b/test/cases/020_kernel/010_kmod/kmod.yml index 72d17485c..5765ddfa2 100644 --- a/test/cases/020_kernel/010_kmod/kmod.yml +++ b/test/cases/020_kernel/010_kmod/kmod.yml @@ -14,11 +14,7 @@ onboot: capabilities: - all - name: poweroff - image: "linuxkit/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084" - pid: host + image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "3"] - capabilities: - - CAP_SYS_BOOT - readonly: true outputs: - format: kernel+initrd diff --git a/test/cases/040_packages/000_sysctl/test-sysctl.yml b/test/cases/040_packages/000_sysctl/test-sysctl.yml index ab50f8cc7..f6bceee6e 100644 --- a/test/cases/040_packages/000_sysctl/test-sysctl.yml +++ b/test/cases/040_packages/000_sysctl/test-sysctl.yml @@ -12,13 +12,7 @@ onboot: - name: test image: "linuxkit/test-sysctl:c4df4c4d692904d6245dcdef1f4a79389bd3d894" - name: poweroff - image: "linuxkit/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084" - net: host - pid: host - command: ["/bin/sh", "/poweroff.sh", "3"] - capabilities: - - CAP_SYS_BOOT - readonly: true + image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" trust: image: - linuxkit/kernel diff --git a/test/hack/test-ltp.yml b/test/hack/test-ltp.yml index 5f94970da..c7367a31a 100644 --- a/test/hack/test-ltp.yml +++ b/test/hack/test-ltp.yml @@ -16,11 +16,7 @@ onboot: capabilities: - all - name: poweroff - image: "linuxkit/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084" - pid: host - capabilities: - - CAP_SYS_BOOT - readonly: true + image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" files: - path: /etc/ltp/baseline contents: "100" diff --git a/test/hack/test.yml b/test/hack/test.yml index 60b9b185b..2171ff947 100644 --- a/test/hack/test.yml +++ b/test/hack/test.yml @@ -24,11 +24,7 @@ onboot: image: "linuxkit/test-kernel-config:ecff41279ccbc408079a3996a956432651c6eb9c" readonly: true - name: poweroff - image: "linuxkit/poweroff:961412b8ef5c5285de0d40ec076701d955eaa084" - pid: host + image: "linuxkit/poweroff:a8f1e4ad8d459f1fdaad9e4b007512cb3b504ae8" command: ["/bin/sh", "/poweroff.sh", "3"] - capabilities: - - CAP_SYS_BOOT - readonly: true outputs: - format: gcp-img diff --git a/test/pkg/poweroff/Dockerfile b/test/pkg/poweroff/Dockerfile index 1eb8acc4a..81bd752f7 100644 --- a/test/pkg/poweroff/Dockerfile +++ b/test/pkg/poweroff/Dockerfile @@ -1,3 +1,4 @@ FROM alpine:3.5 ADD . ./ ENTRYPOINT ["/bin/sh", "/poweroff.sh"] +LABEL org.mobyproject.config='{"net": "host","pid": "host", "ipc": "host", "readonly": true, "capabilities": ["CAP_SYS_BOOT"]}'