Merge pull request #2810 from rn/arm64-test

Fix up tests to work on arm64 plus more alpine 3.7 goodness

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"]

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

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

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:

test/cases/000_build/000_formats/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
 

test/cases/000_build/000_formats/003_gcp/test.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 # SUMMARY: Check that gcp output format is generated
-# LABELS:
+# LABELS: amd64
 
 set -e
 

test/cases/000_build/000_formats/004_aws/test.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 # SUMMARY: Check that raw output format is generated
-# LABELS:
+# LABELS: amd64
 
 set -e
 

test/cases/000_build/000_formats/007_vmdk/test.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 # SUMMARY: Check that vmdk output format is generated
-# LABELS:
+# LABELS: amd64
 
 set -e
 

test/cases/000_build/000_formats/008_raw_bios/test.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 # SUMMARY: Check that raw output format is generated
-# LABELS:
+# LABELS: amd64
 
 set -e
 

test/cases/000_build/000_formats/010_qcow2_bios/test.sh

@@ -1,6 +1,6 @@
 #!/bin/sh
 # SUMMARY: Check that qcow2 output format is generated
-# LABELS:
+# LABELS: amd64
 
 set -e
 

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
 

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
 

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
 

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
 

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

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
 

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
 

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
 

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
 

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

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

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

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

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

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

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"]

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

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"]

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

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"]

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

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

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

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

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

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
@@ -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

test/cases/040_packages/003_ca-certificates/test.yml

@@ -1,13 +1,13 @@
 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
   - 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

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
@@ -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

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
@@ -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"]

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
@@ -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

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
@@ -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"]

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
@@ -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

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
@@ -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"]

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
@@ -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

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
@@ -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

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
@@ -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

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
@@ -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

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
@@ -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

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
@@ -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

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
@@ -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

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
@@ -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

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
@@ -38,14 +38,15 @@ onboot:
           net: /run/netns/wg1
 onshutdown:
   - name: test2
-    image: alpine:3.6
+    image: alpine:3.7
     binds:
       - /tmp:/tmp
       - /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
@@ -54,7 +55,7 @@ services:
      - CAP_SETGID
      - CAP_DAC_OVERRIDE
   - name: test
-    image: alpine:3.6
+    image: alpine:3.7
     net: /run/netns/wg1
     pid: host
     capabilities: