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