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 <rolf.neugebauer@docker.com>

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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