From 8434058dcf2ec0b0b3c64f0451a1b64f7952ea94 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 11 Dec 2017 13:48:03 +0000 Subject: [PATCH 01/10] tests: Switch test to alpine:3.7 Some testis explicitly use alpine:3.6 and alpine:3.5 to run some shell scripts. Switch them to alpine:3.7 like the rest of the packages and tools. Signed-off-by: Rolf Neugebauer --- test/cases/020_kernel/010_kmod_4.4.x/Dockerfile | 2 +- test/cases/020_kernel/011_kmod_4.9.x/Dockerfile | 2 +- test/cases/020_kernel/016_kmod_4.14.x/Dockerfile | 2 +- test/cases/030_security/010_ports/test.yml | 2 +- test/cases/040_packages/002_binfmt/test.yml | 4 ++-- test/cases/040_packages/003_ca-certificates/test.yml | 4 ++-- test/cases/040_packages/004_dhcpcd/test.yml | 4 ++-- 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/006_format_mount/000_auto/test.yml | 2 +- .../cases/040_packages/006_format_mount/001_by_label/test.yml | 2 +- .../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 +- .../cases/040_packages/006_format_mount/010_multiple/test.yml | 2 +- test/cases/040_packages/019_sysctl/test.yml | 4 ++-- test/cases/040_packages/023_wireguard/test.yml | 4 ++-- 21 files changed, 26 insertions(+), 26 deletions(-) diff --git a/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile b/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile index 51d54a1d9..9df81a966 100644 --- a/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile +++ b/test/cases/020_kernel/010_kmod_4.4.x/Dockerfile @@ -17,7 +17,7 @@ COPY ./src/* ./ RUN make all # Package -FROM alpine:3.5 +FROM alpine:3.7 COPY --from=build /kmod/hello_world.ko / COPY check.sh /check.sh ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile index 5088a1017..bfdda25de 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile +++ b/test/cases/020_kernel/011_kmod_4.9.x/Dockerfile @@ -17,7 +17,7 @@ COPY ./src/* ./ RUN make all # Package -FROM alpine:3.5 +FROM alpine:3.7 COPY --from=build /kmod/hello_world.ko / COPY check.sh /check.sh ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile b/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile index f1a23cd7e..8499d04ef 100644 --- a/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile +++ b/test/cases/020_kernel/016_kmod_4.14.x/Dockerfile @@ -17,7 +17,7 @@ COPY ./src/* ./ RUN make all # Package -FROM alpine:3.5 +FROM alpine:3.7 COPY --from=build /kmod/hello_world.ko / COPY check.sh /check.sh ENTRYPOINT ["/bin/sh", "/check.sh"] diff --git a/test/cases/030_security/010_ports/test.yml b/test/cases/030_security/010_ports/test.yml index aba513b1c..eed617283 100644 --- a/test/cases/030_security/010_ports/test.yml +++ b/test/cases/030_security/010_ports/test.yml @@ -6,7 +6,7 @@ init: - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 onboot: - name: test - image: alpine:3.6 + image: alpine:3.7 readonly: true binds: - /check.sh:/check.sh diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index 7e1c2ef18..c771669f1 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -8,7 +8,7 @@ onboot: - name: binfmt image: linuxkit/binfmt:4b1d7a8dab03c09855fb4b6060a42b2294674b47 - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /check.sh:/check.sh - /proc/sys/fs/binfmt_misc:/binfmt_misc @@ -23,4 +23,4 @@ trust: org: - linuxkit image: - - alpine:3.6 + - alpine:3.7 diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index 508174d8f..f0279d649 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -7,7 +7,7 @@ init: - linuxkit/ca-certificates:de21b84d9b055ad9dcecc57965b654a7a24ef8e0 onboot: - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /check.sh:/check.sh - /etc:/host-etc @@ -22,4 +22,4 @@ trust: org: - linuxkit image: - - alpine:3.6 + - alpine:3.7 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 5467dde2d..0477bef96 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -9,7 +9,7 @@ onboot: image: linuxkit/dhcpcd:0d59a6cc03412289ef4313f2491ec666c1715cc9 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: test - image: alpine:3.6 + image: alpine:3.7 net: host binds: - /check.sh:/check.sh @@ -24,4 +24,4 @@ trust: org: - linuxkit image: - - alpine:3.6 + - alpine:3.7 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 5812aa813..efc0c42ac 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 @@ -11,7 +11,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] 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 928458bc3..fd980720c 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -11,7 +11,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh 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 868f37b0e..bea408266 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 @@ -15,7 +15,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] 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 18c18a47d..a4b9bd9b7 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -15,7 +15,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh 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 157935a62..cb4371049 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 @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker command: ["touch", "/var/lib/docker/bar"] 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 fd5920e1b..bf586e01a 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh 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 ad1a4d5f6..2de931795 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 @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh 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 728fe09e8..47382c2b9 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 @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "-label", "docker", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh 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 8c9dea237..eded2d802 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 @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "-device", "@DEVICE@1", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh 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 54f7e5641..f39ae88d6 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 @@ -15,7 +15,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh 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 bcc734fae..619d7000f 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 @@ -12,7 +12,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "/var/lib/docker"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker - /check.sh:/check.sh 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 d6e7fa53d..2cba3eaec 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 @@ -18,7 +18,7 @@ onboot: image: linuxkit/mount:b346ec277b7074e5c9986128a879c10a1d18742b command: ["/usr/bin/mountie", "-label", "foo", "/var/foo"] - name: test - image: alpine:3.6 + image: alpine:3.7 binds: - /var/lib/docker:/var/lib/docker - /var/foo:/var/foo diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index c90506645..f59a7d5e9 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -8,7 +8,7 @@ onboot: - name: sysctl image: linuxkit/sysctl:ce3bde5118a41092f1b7048c85d14fb35237ed45 - name: test - image: alpine:3.6 + image: alpine:3.7 net: host pid: host ipc: host @@ -25,4 +25,4 @@ trust: org: - linuxkit image: - - alpine:3.6 + - alpine:3.7 diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 1c568da64..9b7429cd6 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -38,7 +38,7 @@ onboot: net: /run/netns/wg1 onshutdown: - name: test2 - image: alpine:3.6 + image: alpine:3.7 binds: - /tmp:/tmp - /check.sh:/check.sh @@ -54,7 +54,7 @@ services: - CAP_SETGID - CAP_DAC_OVERRIDE - name: test - image: alpine:3.6 + image: alpine:3.7 net: /run/netns/wg1 pid: host capabilities: From 00d778cdba2a01508d6f1f595098453b6ed1e7aa Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 11 Dec 2017 13:49:34 +0000 Subject: [PATCH 02/10] Switch remaining YAML files to alpine:3.7 Signed-off-by: Rolf Neugebauer --- blueprints/docker-for-mac/base.yml | 4 ++-- examples/vpnkit-forwarder.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/blueprints/docker-for-mac/base.yml b/blueprints/docker-for-mac/base.yml index ea2e59b6c..edd9b7c07 100644 --- a/blueprints/docker-for-mac/base.yml +++ b/blueprints/docker-for-mac/base.yml @@ -30,7 +30,7 @@ onboot: command: ["/swap.sh", "--path", "/var/lib/swap", "--size", "1024M"] # mount-vpnkit mounts the 9p share used by vpnkit to coordinate port forwarding - name: mount-vpnkit - image: alpine:3.6 + image: alpine:3.7 binds: - /var/:/host_var:rbind,rshared capabilities: @@ -39,7 +39,7 @@ onboot: command: ["sh", "-c", "mkdir -p /host_var/vpnkit/port && mount -v -t 9p -o trans=virtio,dfltuid=1001,dfltgid=50,version=9p2000 port /host_var/vpnkit"] # move logs to the mounted disk (this is a temporary fix until we can limit the log sizes) - name: move-logs - image: alpine:3.6 + image: alpine:3.7 binds: - /var:/host_var command: ["sh", "-c", "mv -v /host_var/log /host_var/lib && ln -vs /var/lib/log /host_var/log"] diff --git a/examples/vpnkit-forwarder.yml b/examples/vpnkit-forwarder.yml index 1771fdcad..a677e9a24 100644 --- a/examples/vpnkit-forwarder.yml +++ b/examples/vpnkit-forwarder.yml @@ -10,7 +10,7 @@ onboot: image: linuxkit/dhcpcd:0d59a6cc03412289ef4313f2491ec666c1715cc9 command: ["/sbin/dhcpcd", "--nobackground", "-f", "/dhcpcd.conf", "-1"] - name: mount-vpnkit - image: alpine:3.6 + image: alpine:3.7 binds: - /var/:/host_var:rbind,rshared capabilities: From a0676106a25f9f7bd03c052957f9cfdf84e665bd Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 11 Dec 2017 14:16:35 +0000 Subject: [PATCH 03/10] tests: Disable x86 specific build.output tests for arm64 *-bios and various cloud output image types are not supported on arm64. Use the automatic 'amd64' label to disable them for arm64. Signed-off-by: Rolf Neugebauer --- test/cases/000_build/000_outputs/001_iso-bios/test.sh | 2 +- test/cases/000_build/000_outputs/003_gcp/test.sh | 2 +- test/cases/000_build/000_outputs/004_aws/test.sh | 2 +- test/cases/000_build/000_outputs/007_vmdk/test.sh | 2 +- test/cases/000_build/000_outputs/008_raw_bios/test.sh | 2 +- test/cases/000_build/000_outputs/010_qcow2_bios/test.sh | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/test/cases/000_build/000_outputs/001_iso-bios/test.sh b/test/cases/000_build/000_outputs/001_iso-bios/test.sh index 600ae620c..6ae53d50a 100644 --- a/test/cases/000_build/000_outputs/001_iso-bios/test.sh +++ b/test/cases/000_build/000_outputs/001_iso-bios/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Check that iso-bios output format is generated -# LABELS: +# LABELS: amd64 set -e diff --git a/test/cases/000_build/000_outputs/003_gcp/test.sh b/test/cases/000_build/000_outputs/003_gcp/test.sh index 86b2bcb82..85693ad7e 100644 --- a/test/cases/000_build/000_outputs/003_gcp/test.sh +++ b/test/cases/000_build/000_outputs/003_gcp/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Check that gcp output format is generated -# LABELS: +# LABELS: amd64 set -e diff --git a/test/cases/000_build/000_outputs/004_aws/test.sh b/test/cases/000_build/000_outputs/004_aws/test.sh index 36ca4da7e..d698f3700 100644 --- a/test/cases/000_build/000_outputs/004_aws/test.sh +++ b/test/cases/000_build/000_outputs/004_aws/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Check that raw output format is generated -# LABELS: +# LABELS: amd64 set -e diff --git a/test/cases/000_build/000_outputs/007_vmdk/test.sh b/test/cases/000_build/000_outputs/007_vmdk/test.sh index 3ac459d13..c52ed591a 100644 --- a/test/cases/000_build/000_outputs/007_vmdk/test.sh +++ b/test/cases/000_build/000_outputs/007_vmdk/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Check that vmdk output format is generated -# LABELS: +# LABELS: amd64 set -e diff --git a/test/cases/000_build/000_outputs/008_raw_bios/test.sh b/test/cases/000_build/000_outputs/008_raw_bios/test.sh index 55d3f241a..264e30cae 100644 --- a/test/cases/000_build/000_outputs/008_raw_bios/test.sh +++ b/test/cases/000_build/000_outputs/008_raw_bios/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Check that raw output format is generated -# LABELS: +# LABELS: amd64 set -e diff --git a/test/cases/000_build/000_outputs/010_qcow2_bios/test.sh b/test/cases/000_build/000_outputs/010_qcow2_bios/test.sh index 5f84df9db..d7795568a 100644 --- a/test/cases/000_build/000_outputs/010_qcow2_bios/test.sh +++ b/test/cases/000_build/000_outputs/010_qcow2_bios/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Check that qcow2 output format is generated -# LABELS: +# LABELS: amd64 set -e From bf77f64e3c52555b504e777e80a83d0a1a056c39 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 11 Dec 2017 14:25:37 +0000 Subject: [PATCH 04/10] tests: Rename build.outputs to build.formats The 'linuxkit build' command line option was renamed from '-output' to '-format' a while back. Rename the test group to reflect the change. Signed-off-by: Rolf Neugebauer --- .../{000_outputs => 000_formats}/000_kernel+initrd/test.sh | 0 .../000_build/{000_outputs => 000_formats}/001_iso-bios/test.sh | 0 .../000_build/{000_outputs => 000_formats}/002_iso-efi/test.sh | 0 test/cases/000_build/{000_outputs => 000_formats}/003_gcp/test.sh | 0 test/cases/000_build/{000_outputs => 000_formats}/004_aws/test.sh | 0 test/cases/000_build/{000_outputs => 000_formats}/006_vhd/test.sh | 0 .../cases/000_build/{000_outputs => 000_formats}/007_vmdk/test.sh | 0 .../000_build/{000_outputs => 000_formats}/008_raw_bios/test.sh | 0 .../000_build/{000_outputs => 000_formats}/009_raw_efi/test.sh | 0 .../000_build/{000_outputs => 000_formats}/010_qcow2_bios/test.sh | 0 test/cases/000_build/{000_outputs => 000_formats}/test.yml | 0 11 files changed, 0 insertions(+), 0 deletions(-) rename test/cases/000_build/{000_outputs => 000_formats}/000_kernel+initrd/test.sh (100%) rename test/cases/000_build/{000_outputs => 000_formats}/001_iso-bios/test.sh (100%) rename test/cases/000_build/{000_outputs => 000_formats}/002_iso-efi/test.sh (100%) rename test/cases/000_build/{000_outputs => 000_formats}/003_gcp/test.sh (100%) rename test/cases/000_build/{000_outputs => 000_formats}/004_aws/test.sh (100%) rename test/cases/000_build/{000_outputs => 000_formats}/006_vhd/test.sh (100%) rename test/cases/000_build/{000_outputs => 000_formats}/007_vmdk/test.sh (100%) rename test/cases/000_build/{000_outputs => 000_formats}/008_raw_bios/test.sh (100%) rename test/cases/000_build/{000_outputs => 000_formats}/009_raw_efi/test.sh (100%) rename test/cases/000_build/{000_outputs => 000_formats}/010_qcow2_bios/test.sh (100%) rename test/cases/000_build/{000_outputs => 000_formats}/test.yml (100%) diff --git a/test/cases/000_build/000_outputs/000_kernel+initrd/test.sh b/test/cases/000_build/000_formats/000_kernel+initrd/test.sh similarity index 100% rename from test/cases/000_build/000_outputs/000_kernel+initrd/test.sh rename to test/cases/000_build/000_formats/000_kernel+initrd/test.sh diff --git a/test/cases/000_build/000_outputs/001_iso-bios/test.sh b/test/cases/000_build/000_formats/001_iso-bios/test.sh similarity index 100% rename from test/cases/000_build/000_outputs/001_iso-bios/test.sh rename to test/cases/000_build/000_formats/001_iso-bios/test.sh diff --git a/test/cases/000_build/000_outputs/002_iso-efi/test.sh b/test/cases/000_build/000_formats/002_iso-efi/test.sh similarity index 100% rename from test/cases/000_build/000_outputs/002_iso-efi/test.sh rename to test/cases/000_build/000_formats/002_iso-efi/test.sh diff --git a/test/cases/000_build/000_outputs/003_gcp/test.sh b/test/cases/000_build/000_formats/003_gcp/test.sh similarity index 100% rename from test/cases/000_build/000_outputs/003_gcp/test.sh rename to test/cases/000_build/000_formats/003_gcp/test.sh diff --git a/test/cases/000_build/000_outputs/004_aws/test.sh b/test/cases/000_build/000_formats/004_aws/test.sh similarity index 100% rename from test/cases/000_build/000_outputs/004_aws/test.sh rename to test/cases/000_build/000_formats/004_aws/test.sh diff --git a/test/cases/000_build/000_outputs/006_vhd/test.sh b/test/cases/000_build/000_formats/006_vhd/test.sh similarity index 100% rename from test/cases/000_build/000_outputs/006_vhd/test.sh rename to test/cases/000_build/000_formats/006_vhd/test.sh diff --git a/test/cases/000_build/000_outputs/007_vmdk/test.sh b/test/cases/000_build/000_formats/007_vmdk/test.sh similarity index 100% rename from test/cases/000_build/000_outputs/007_vmdk/test.sh rename to test/cases/000_build/000_formats/007_vmdk/test.sh diff --git a/test/cases/000_build/000_outputs/008_raw_bios/test.sh b/test/cases/000_build/000_formats/008_raw_bios/test.sh similarity index 100% rename from test/cases/000_build/000_outputs/008_raw_bios/test.sh rename to test/cases/000_build/000_formats/008_raw_bios/test.sh diff --git a/test/cases/000_build/000_outputs/009_raw_efi/test.sh b/test/cases/000_build/000_formats/009_raw_efi/test.sh similarity index 100% rename from test/cases/000_build/000_outputs/009_raw_efi/test.sh rename to test/cases/000_build/000_formats/009_raw_efi/test.sh diff --git a/test/cases/000_build/000_outputs/010_qcow2_bios/test.sh b/test/cases/000_build/000_formats/010_qcow2_bios/test.sh similarity index 100% rename from test/cases/000_build/000_outputs/010_qcow2_bios/test.sh rename to test/cases/000_build/000_formats/010_qcow2_bios/test.sh diff --git a/test/cases/000_build/000_outputs/test.yml b/test/cases/000_build/000_formats/test.yml similarity index 100% rename from test/cases/000_build/000_outputs/test.yml rename to test/cases/000_build/000_formats/test.yml From 851b4b875e5ddcccc8c249f414cfb353d11ab8e0 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 11 Dec 2017 14:31:10 +0000 Subject: [PATCH 05/10] tests: Disable tests for x86 specific examples/blueprints - docker: Disabled because we don't have arm64 dind images - tpm: The tss package is not compiled for arm64 - wireguard: This uses nginx:alpine which is not yet multi-arch - docker_for_mac: Is x86 specific Signed-off-by: Rolf Neugebauer --- test/cases/000_build/100_examples/010_docker/test.sh | 2 +- test/cases/000_build/100_examples/060_tpm/test.sh | 2 +- test/cases/000_build/100_examples/070_wireguard/test.sh | 2 +- test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/cases/000_build/100_examples/010_docker/test.sh b/test/cases/000_build/100_examples/010_docker/test.sh index 2dcffde26..72cfe1abb 100644 --- a/test/cases/000_build/100_examples/010_docker/test.sh +++ b/test/cases/000_build/100_examples/010_docker/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Test the docker example -# LABELS: +# LABELS: amd64 set -e diff --git a/test/cases/000_build/100_examples/060_tpm/test.sh b/test/cases/000_build/100_examples/060_tpm/test.sh index 57ea35aab..5c960e52d 100644 --- a/test/cases/000_build/100_examples/060_tpm/test.sh +++ b/test/cases/000_build/100_examples/060_tpm/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Test the tpm example -# LABELS: +# LABELS: amd64 set -e diff --git a/test/cases/000_build/100_examples/070_wireguard/test.sh b/test/cases/000_build/100_examples/070_wireguard/test.sh index f0495dd1a..69f5fd6a7 100644 --- a/test/cases/000_build/100_examples/070_wireguard/test.sh +++ b/test/cases/000_build/100_examples/070_wireguard/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Test the wireguard example -# LABELS: +# LABELS: amd64 set -e diff --git a/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh b/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh index b50f47bb9..a6e06182b 100644 --- a/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh +++ b/test/cases/000_build/200_blueprints/010_docker_for_mac/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Test the Docker for Mac blueprint -# LABELS: +# LABELS: amd64 set -e From 1b5a10ad3f71abe4c3b30bceda4eac2c8c84709a Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 11 Dec 2017 14:40:01 +0000 Subject: [PATCH 06/10] examples/swap: Remove nginx from YAML It is not needed and the 'nginx:alpine' variant is not yet multi-arch so it won't work on arm64. Signed-off-by: Rolf Neugebauer --- examples/swap.yml | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/examples/swap.yml b/examples/swap.yml index 9a91cf702..d17c7770c 100644 --- a/examples/swap.yml +++ b/examples/swap.yml @@ -29,16 +29,6 @@ services: - INSECURE=true - name: rngd image: linuxkit/rngd:94e01a4b16fadb053455cdc2269c4eb0b39199cd - - name: nginx - image: nginx:alpine - capabilities: - - CAP_NET_BIND_SERVICE - - CAP_CHOWN - - CAP_SETUID - - CAP_SETGID - - CAP_DAC_OVERRIDE - binds: - - /etc/resolv.conf:/etc/resolv.conf trust: org: - linuxkit From b3c3267627425834e82bc452dc3fb992607427d1 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 11 Dec 2017 14:41:35 +0000 Subject: [PATCH 07/10] examples/redis: Explicitly use redis:4.0.5-alpine Currently there is a Content Trust issue with 4.0-alpine as well as 4-alpine on arm64. 4.0.5-alpine works, so use it for the example. Signed-off-by: Rolf Neugebauer --- examples/redis-os.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/examples/redis-os.yml b/examples/redis-os.yml index 6d5b6f928..47ba7188c 100644 --- a/examples/redis-os.yml +++ b/examples/redis-os.yml @@ -16,8 +16,10 @@ services: image: linuxkit/getty:22e27189b6b354e1d5d38fc0536a5af3f2adb79f env: - INSECURE=true + # Currently redis:4.0.6-alpine has trust issue with multi-arch + # https://github.com/docker-library/official-images/issues/3794 - name: redis - image: redis:4.0-alpine + image: redis:4.0.5-alpine capabilities: - CAP_NET_BIND_SERVICE - CAP_CHOWN From 5ef41cfc710d8c0d9c7901abc2ede8a999774f8a Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 11 Dec 2017 15:20:45 +0000 Subject: [PATCH 08/10] tests: Fix platforms.qemu tests for arm64 - Disable tests which use unsupported formats - Enable serial arm64 console for kernel+initrd test Signed-off-by: Rolf Neugebauer --- test/cases/010_platforms/000_qemu/000_run_kernel/test.yml | 2 +- test/cases/010_platforms/000_qemu/010_run_iso/test.sh | 2 +- test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.sh | 2 +- test/cases/010_platforms/000_qemu/040_run_raw_bios/test.sh | 2 +- test/cases/010_platforms/000_qemu/050_run_aws/test.sh | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) 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 37a6569a4..ef397f0a1 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 @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/010_platforms/000_qemu/010_run_iso/test.sh b/test/cases/010_platforms/000_qemu/010_run_iso/test.sh index 914f12ecf..93e34bafb 100644 --- a/test/cases/010_platforms/000_qemu/010_run_iso/test.sh +++ b/test/cases/010_platforms/000_qemu/010_run_iso/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Check that legacy BIOS ISO boots in qemu -# LABELS: +# LABELS: amd64 set -e diff --git a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.sh b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.sh index bd57df17b..ea4778169 100644 --- a/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.sh +++ b/test/cases/010_platforms/000_qemu/030_run_qcow_bios/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Check that qcow2 image boots in qemu -# LABELS: +# LABELS: amd64 set -e diff --git a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.sh b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.sh index da2d06b84..ab96960cc 100644 --- a/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.sh +++ b/test/cases/010_platforms/000_qemu/040_run_raw_bios/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Check that raw image boots in qemu -# LABELS: +# LABELS: amd64 set -e diff --git a/test/cases/010_platforms/000_qemu/050_run_aws/test.sh b/test/cases/010_platforms/000_qemu/050_run_aws/test.sh index 5dbde93f2..f1ee66370 100644 --- a/test/cases/010_platforms/000_qemu/050_run_aws/test.sh +++ b/test/cases/010_platforms/000_qemu/050_run_aws/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Check that raw image boots in qemu -# LABELS: +# LABELS: amd64 set -e From 2396d91cd8349571ce009e8a5d37e30c4f647b1f Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 11 Dec 2017 15:27:46 +0000 Subject: [PATCH 09/10] tests: Adjust kernel tests for arm64 - Disable kernel config tests on arm64 as some are x86_64 specific: https://github.com/linuxkit/linuxkit/issues/2807 - Add arm64 console to tests Signed-off-by: Rolf Neugebauer --- test/cases/020_kernel/000_config_4.4.x/test.sh | 3 ++- test/cases/020_kernel/000_config_4.4.x/test.yml | 2 +- test/cases/020_kernel/001_config_4.9.x/test.sh | 3 ++- test/cases/020_kernel/001_config_4.9.x/test.yml | 2 +- test/cases/020_kernel/006_config_4.14.x/test.sh | 3 ++- test/cases/020_kernel/006_config_4.14.x/test.yml | 2 +- test/cases/020_kernel/010_kmod_4.4.x/test.yml | 2 +- test/cases/020_kernel/011_kmod_4.9.x/test.yml | 2 +- test/cases/020_kernel/016_kmod_4.14.x/test.yml | 2 +- .../cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml | 2 +- .../cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml | 2 +- .../020_kernel/110_namespace/006_kernel-4.14.x/common.yml | 2 +- 12 files changed, 15 insertions(+), 12 deletions(-) diff --git a/test/cases/020_kernel/000_config_4.4.x/test.sh b/test/cases/020_kernel/000_config_4.4.x/test.sh index fdfccb99c..d05101590 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test.sh +++ b/test/cases/020_kernel/000_config_4.4.x/test.sh @@ -1,6 +1,7 @@ #!/bin/sh # SUMMARY: Sanity check on the kernel config file -# LABELS: +# disabled for arm64: https://github.com/linuxkit/linuxkit/issues/2807 +# LABELS: amd64 # REPEAT: set -e diff --git a/test/cases/020_kernel/000_config_4.4.x/test.yml b/test/cases/020_kernel/000_config_4.4.x/test.yml index 76ea26f67..ad12f1ab1 100644 --- a/test/cases/020_kernel/000_config_4.4.x/test.yml +++ b/test/cases/020_kernel/000_config_4.4.x/test.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.4.105 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/020_kernel/001_config_4.9.x/test.sh b/test/cases/020_kernel/001_config_4.9.x/test.sh index fdfccb99c..d05101590 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.sh +++ b/test/cases/020_kernel/001_config_4.9.x/test.sh @@ -1,6 +1,7 @@ #!/bin/sh # SUMMARY: Sanity check on the kernel config file -# LABELS: +# disabled for arm64: https://github.com/linuxkit/linuxkit/issues/2807 +# LABELS: amd64 # REPEAT: set -e diff --git a/test/cases/020_kernel/001_config_4.9.x/test.yml b/test/cases/020_kernel/001_config_4.9.x/test.yml index c238ae27f..a57758b4c 100644 --- a/test/cases/020_kernel/001_config_4.9.x/test.yml +++ b/test/cases/020_kernel/001_config_4.9.x/test.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/020_kernel/006_config_4.14.x/test.sh b/test/cases/020_kernel/006_config_4.14.x/test.sh index fdfccb99c..d05101590 100644 --- a/test/cases/020_kernel/006_config_4.14.x/test.sh +++ b/test/cases/020_kernel/006_config_4.14.x/test.sh @@ -1,6 +1,7 @@ #!/bin/sh # SUMMARY: Sanity check on the kernel config file -# LABELS: +# disabled for arm64: https://github.com/linuxkit/linuxkit/issues/2807 +# LABELS: amd64 # REPEAT: set -e diff --git a/test/cases/020_kernel/006_config_4.14.x/test.yml b/test/cases/020_kernel/006_config_4.14.x/test.yml index c8b02f169..3963a54d4 100644 --- a/test/cases/020_kernel/006_config_4.14.x/test.yml +++ b/test/cases/020_kernel/006_config_4.14.x/test.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.14.5 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/020_kernel/010_kmod_4.4.x/test.yml b/test/cases/020_kernel/010_kmod_4.4.x/test.yml index 65c88d177..ab1303b9c 100644 --- a/test/cases/020_kernel/010_kmod_4.4.x/test.yml +++ b/test/cases/020_kernel/010_kmod_4.4.x/test.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.4.105 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/020_kernel/011_kmod_4.9.x/test.yml b/test/cases/020_kernel/011_kmod_4.9.x/test.yml index 7987230e9..ee0102f13 100644 --- a/test/cases/020_kernel/011_kmod_4.9.x/test.yml +++ b/test/cases/020_kernel/011_kmod_4.9.x/test.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/020_kernel/016_kmod_4.14.x/test.yml b/test/cases/020_kernel/016_kmod_4.14.x/test.yml index ac7d91225..e072e7d3a 100644 --- a/test/cases/020_kernel/016_kmod_4.14.x/test.yml +++ b/test/cases/020_kernel/016_kmod_4.14.x/test.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.14.5 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml index 4294e6df8..1feb72718 100644 --- a/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml +++ b/test/cases/020_kernel/110_namespace/000_kernel-4.4.x/common.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.4.105 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml index d86004a72..b5c356dff 100644 --- a/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml +++ b/test/cases/020_kernel/110_namespace/001_kernel-4.9.x/common.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml index f17eddf1a..1c3cf7518 100644 --- a/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml +++ b/test/cases/020_kernel/110_namespace/006_kernel-4.14.x/common.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.14.5 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 From ad48a174ba784d589b7bdd1ee063c11af23365d9 Mon Sep 17 00:00:00 2001 From: Rolf Neugebauer Date: Mon, 11 Dec 2017 16:23:36 +0000 Subject: [PATCH 10/10] tests: Fix packages tests for arm64 - Enable console for arm64 for all tests - linuxkit.packages.binfmt is x86_64 only for now - linuxkit.packages.format_mount.by_name seems to hang with no output. needs investigating... - linuxkit.packages.getty-containerd is x86_64 specific - linuxkit.packages.mkimage is x86_64 specific - linuxkit.packages.wireguard: Use the non-alpine variant as it is available as a multiarch for arm64. Use a specific version/tag (1.13.7) as currently 'latest' seem to have issues. Signed-off-by: Rolf Neugebauer --- test/cases/040_packages/002_binfmt/test.sh | 2 +- test/cases/040_packages/002_binfmt/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/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/006_format_mount/000_auto/test.yml | 2 +- .../040_packages/006_format_mount/001_by_label/test.yml | 2 +- test/cases/040_packages/006_format_mount/002_by_name/test.sh | 3 ++- .../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 +- .../006_format_mount/005_by_device_force/test.sh | 3 ++- .../006_format_mount/005_by_device_force/test.yml | 2 +- .../040_packages/006_format_mount/010_multiple/test.yml | 2 +- test/cases/040_packages/007_getty-containerd/test.sh | 3 ++- test/cases/040_packages/007_getty-containerd/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/013_mkimage/test.sh | 2 +- test/cases/040_packages/019_sysctl/test.yml | 2 +- test/cases/040_packages/023_wireguard/test.yml | 5 +++-- 27 files changed, 32 insertions(+), 28 deletions(-) diff --git a/test/cases/040_packages/002_binfmt/test.sh b/test/cases/040_packages/002_binfmt/test.sh index 0f8c8363d..d177f8bc6 100644 --- a/test/cases/040_packages/002_binfmt/test.sh +++ b/test/cases/040_packages/002_binfmt/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Check that the binfmt package works -# LABELS: +# LABELS: amd64 # REPEAT: set -e diff --git a/test/cases/040_packages/002_binfmt/test.yml b/test/cases/040_packages/002_binfmt/test.yml index c771669f1..7be4028a6 100644 --- a/test/cases/040_packages/002_binfmt/test.yml +++ b/test/cases/040_packages/002_binfmt/test.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0 page_poison=1" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/040_packages/003_ca-certificates/test.yml b/test/cases/040_packages/003_ca-certificates/test.yml index f0279d649..bd455eb94 100644 --- a/test/cases/040_packages/003_ca-certificates/test.yml +++ b/test/cases/040_packages/003_ca-certificates/test.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0 page_poison=1" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/040_packages/003_containerd/test.yml b/test/cases/040_packages/003_containerd/test.yml index 8a257b702..bc2c26f2e 100644 --- a/test/cases/040_packages/003_containerd/test.yml +++ b/test/cases/040_packages/003_containerd/test.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0 page_poison=1" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/040_packages/004_dhcpcd/test.yml b/test/cases/040_packages/004_dhcpcd/test.yml index 0477bef96..3f5ff02c1 100644 --- a/test/cases/040_packages/004_dhcpcd/test.yml +++ b/test/cases/040_packages/004_dhcpcd/test.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0 page_poison=1" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 efc0c42ac..6b82474df 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 @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 fd980720c..30ed2b302 100644 --- a/test/cases/040_packages/005_extend/000_ext4/test.yml +++ b/test/cases/040_packages/005_extend/000_ext4/test.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 bea408266..b344953a9 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 @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 a4b9bd9b7..dbd807121 100644 --- a/test/cases/040_packages/005_extend/001_btrfs/test.yml +++ b/test/cases/040_packages/005_extend/001_btrfs/test.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 cb4371049..189936978 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 @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 bf586e01a..a1a0fe376 100644 --- a/test/cases/040_packages/005_extend/002_xfs/test.yml +++ b/test/cases/040_packages/005_extend/002_xfs/test.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 2de931795..a96e69d17 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 @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 47382c2b9..21024beab 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 @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/040_packages/006_format_mount/002_by_name/test.sh b/test/cases/040_packages/006_format_mount/002_by_name/test.sh index c7b4febb2..2adb4d592 100644 --- a/test/cases/040_packages/006_format_mount/002_by_name/test.sh +++ b/test/cases/040_packages/006_format_mount/002_by_name/test.sh @@ -1,6 +1,7 @@ #!/bin/sh # SUMMARY: Check that a formatted disk can be mounted by name -# LABELS: +# Disabled on arm64: https://github.com/linuxkit/linuxkit/issues/2808 +# LABELS: amd64 # REPEAT: set -e 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 eded2d802..1f4111d29 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 @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.38 - cmdline: "console=ttyS0 page_poison=1" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 f39ae88d6..81b9e9810 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 @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 619d7000f..62072dc78 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 @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/040_packages/006_format_mount/005_by_device_force/test.sh b/test/cases/040_packages/006_format_mount/005_by_device_force/test.sh index 8a7abf08c..42240a4d6 100755 --- a/test/cases/040_packages/006_format_mount/005_by_device_force/test.sh +++ b/test/cases/040_packages/006_format_mount/005_by_device_force/test.sh @@ -1,6 +1,7 @@ #!/bin/sh # SUMMARY: Check that the format and mount packages work -# LABELS: +# Disabled on arm64: https://github.com/linuxkit/linuxkit/issues/2808 +# LABELS: amd64 # REPEAT: set -e 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 8be99dfdf..1287fe530 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 @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.51 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 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 2cba3eaec..3d9593277 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 @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/040_packages/007_getty-containerd/test.sh b/test/cases/040_packages/007_getty-containerd/test.sh index a01ada414..3a3760478 100755 --- a/test/cases/040_packages/007_getty-containerd/test.sh +++ b/test/cases/040_packages/007_getty-containerd/test.sh @@ -1,6 +1,7 @@ #!/bin/sh # SUMMARY: Check that ctr can run containers -# LABELS: +# Test is amd64 specific +# LABELS: amd64 # REPEAT: set -e diff --git a/test/cases/040_packages/007_getty-containerd/test.yml b/test/cases/040_packages/007_getty-containerd/test.yml index 8f5655a1e..828f6f44a 100644 --- a/test/cases/040_packages/007_getty-containerd/test.yml +++ b/test/cases/040_packages/007_getty-containerd/test.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.x - cmdline: "console=ttyS0 page_poison=1" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/040_packages/013_mkimage/mkimage.yml b/test/cases/040_packages/013_mkimage/mkimage.yml index 56e8f7d84..4bd559196 100644 --- a/test/cases/040_packages/013_mkimage/mkimage.yml +++ b/test/cases/040_packages/013_mkimage/mkimage.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/040_packages/013_mkimage/run.yml b/test/cases/040_packages/013_mkimage/run.yml index a82357cb8..d7c76872c 100644 --- a/test/cases/040_packages/013_mkimage/run.yml +++ b/test/cases/040_packages/013_mkimage/run.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/040_packages/013_mkimage/test.sh b/test/cases/040_packages/013_mkimage/test.sh index 9a9926156..56e25bfa0 100644 --- a/test/cases/040_packages/013_mkimage/test.sh +++ b/test/cases/040_packages/013_mkimage/test.sh @@ -1,6 +1,6 @@ #!/bin/sh # SUMMARY: Test the mkimage container by using it to build a bootable qcow2 -# LABELS: +# LABELS: amd64 # REPEAT: set -e diff --git a/test/cases/040_packages/019_sysctl/test.yml b/test/cases/040_packages/019_sysctl/test.yml index f59a7d5e9..3f5bdaee8 100644 --- a/test/cases/040_packages/019_sysctl/test.yml +++ b/test/cases/040_packages/019_sysctl/test.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0 page_poison=1" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 diff --git a/test/cases/040_packages/023_wireguard/test.yml b/test/cases/040_packages/023_wireguard/test.yml index 9b7429cd6..152953d28 100644 --- a/test/cases/040_packages/023_wireguard/test.yml +++ b/test/cases/040_packages/023_wireguard/test.yml @@ -1,6 +1,6 @@ kernel: image: linuxkit/kernel:4.9.68 - cmdline: "console=ttyS0" + cmdline: "console=ttyS0 console=ttyAMA0" init: - linuxkit/init:9250948d0de494df8a811edb3242b4584057cfe4 - linuxkit/runc:abc3f292653e64a2fd488e9675ace19a55ec7023 @@ -44,8 +44,9 @@ onshutdown: - /check.sh:/check.sh command: ["sh", "./check.sh", "shutdown"] services: + # We use the non-alpine variant here because it is available as multi-arch - name: nginx - image: nginx:alpine + image: nginx:1.13.7 net: /run/netns/wg0 capabilities: - CAP_NET_BIND_SERVICE