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