diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/e2e/config_arm64.go | 16 | ||||
| -rw-r--r-- | test/system/030-run.bats | 1 | ||||
| -rw-r--r-- | test/system/075-exec.bats | 2 | ||||
| -rw-r--r-- | test/system/150-login.bats | 2 | ||||
| -rw-r--r-- | test/system/200-pod.bats | 1 | ||||
| -rw-r--r-- | test/system/260-sdnotify.bats | 1 | ||||
| -rw-r--r-- | test/system/410-selinux.bats | 3 | ||||
| -rw-r--r-- | test/system/helpers.bash | 10 |
8 files changed, 35 insertions, 1 deletions
diff --git a/test/e2e/config_arm64.go b/test/e2e/config_arm64.go new file mode 100644 index 000000000..c1e0afc47 --- /dev/null +++ b/test/e2e/config_arm64.go @@ -0,0 +1,16 @@ +package integration + +var ( + STORAGE_FS = "vfs" //nolint:revive,stylecheck + STORAGE_OPTIONS = "--storage-driver vfs" //nolint:revive,stylecheck + ROOTLESS_STORAGE_FS = "vfs" //nolint:revive,stylecheck + ROOTLESS_STORAGE_OPTIONS = "--storage-driver vfs" //nolint:revive,stylecheck + CACHE_IMAGES = []string{ALPINE, BB, fedoraMinimal, NGINX_IMAGE, REDIS_IMAGE, REGISTRY_IMAGE, INFRA_IMAGE, LABELS_IMAGE, HEALTHCHECK_IMAGE, UBI_INIT, UBI_MINIMAL, fedoraToolbox} //nolint:revive,stylecheck + NGINX_IMAGE = "quay.io/lsm5/alpine_nginx-aarch64:latest" //nolint:revive,stylecheck + BB_GLIBC = "docker.io/library/busybox:glibc" //nolint:revive,stylecheck + REGISTRY_IMAGE = "quay.io/libpod/registry:2.6" //nolint:revive,stylecheck + LABELS_IMAGE = "quay.io/libpod/alpine_labels:latest" //nolint:revive,stylecheck + UBI_MINIMAL = "registry.access.redhat.com/ubi8-minimal" //nolint:revive,stylecheck + UBI_INIT = "registry.access.redhat.com/ubi8-init" //nolint:revive,stylecheck + CIRROS_IMAGE = "quay.io/libpod/cirros:latest" //nolint:revive,stylecheck +) diff --git a/test/system/030-run.bats b/test/system/030-run.bats index 5014ef47b..d028a5ac7 100644 --- a/test/system/030-run.bats +++ b/test/system/030-run.bats @@ -3,6 +3,7 @@ load helpers @test "podman run - basic tests" { + skip_if_aarch64 "FIXME: #15074 - fails on aarch64" rand=$(random_string 30) err_no_such_cmd="Error:.*/no/such/command.*[Nn]o such file or directory" diff --git a/test/system/075-exec.bats b/test/system/075-exec.bats index 0a6048b7e..7dd43c2c3 100644 --- a/test/system/075-exec.bats +++ b/test/system/075-exec.bats @@ -6,6 +6,8 @@ load helpers @test "podman exec - basic test" { + skip_if_aarch64 "FIXME: #15074 - fails on aarch64" + rand_filename=$(random_string 20) rand_content=$(random_string 50) diff --git a/test/system/150-login.bats b/test/system/150-login.bats index dc902d5fe..b57bb44ab 100644 --- a/test/system/150-login.bats +++ b/test/system/150-login.bats @@ -52,7 +52,7 @@ function setup() { mkdir -p $AUTHDIR # Registry image; copy of docker.io, but on our own registry - local REGISTRY_IMAGE="$PODMAN_TEST_IMAGE_REGISTRY/$PODMAN_TEST_IMAGE_USER/registry:2.7" + local REGISTRY_IMAGE="$PODMAN_TEST_IMAGE_REGISTRY/$PODMAN_TEST_IMAGE_USER/registry:2.8" # Pull registry image, but into a separate container storage mkdir -p ${PODMAN_LOGIN_WORKDIR}/root diff --git a/test/system/200-pod.bats b/test/system/200-pod.bats index da2f7cd59..cbbd62ffb 100644 --- a/test/system/200-pod.bats +++ b/test/system/200-pod.bats @@ -478,6 +478,7 @@ spec: } @test "pod resource limits" { + # FIXME: #15074 - possible flake on aarch64 skip_if_remote "resource limits only implemented on non-remote" skip_if_rootless "resource limits only work with root" skip_if_cgroupsv1 "resource limits only meaningful on cgroups V2" diff --git a/test/system/260-sdnotify.bats b/test/system/260-sdnotify.bats index 59456de24..cd7b1262a 100644 --- a/test/system/260-sdnotify.bats +++ b/test/system/260-sdnotify.bats @@ -132,6 +132,7 @@ READY=1" "sdnotify sent MAINPID and READY" # These tests can fail in dev. environment because of SELinux. # quick fix: chcon -t container_runtime_exec_t ./bin/podman @test "sdnotify : container" { + skip_if_aarch64 "FIXME: #15074 - fails on aarch64 non-remote" # Sigh... we need to pull a humongous image because it has systemd-notify. # (IMPORTANT: fedora:32 and above silently removed systemd-notify; this # caused CI to hang. That's why we explicitly require fedora:31) diff --git a/test/system/410-selinux.bats b/test/system/410-selinux.bats index d437465a4..082482c7a 100644 --- a/test/system/410-selinux.bats +++ b/test/system/410-selinux.bats @@ -39,10 +39,12 @@ function check_label() { } @test "podman selinux: container with label=disable" { + skip_if_aarch64 "FIXME: #15074 - fails on aarch64" check_label "--security-opt label=disable" "spc_t" } @test "podman selinux: privileged container" { + skip_if_aarch64 "FIXME: #15074 - fails on aarch64" check_label "--privileged --userns=host" "spc_t" } @@ -63,6 +65,7 @@ function check_label() { } @test "podman selinux: pid=host" { + skip_if_aarch64 "FIXME: #15074 - fails on aarch64" # FIXME this test fails when run rootless with runc: # Error: container_linux.go:367: starting container process caused: process_linux.go:495: container init caused: readonly path /proc/asound: operation not permitted: OCI permission denied if is_rootless; then diff --git a/test/system/helpers.bash b/test/system/helpers.bash index b9da2d89a..19bc6547c 100644 --- a/test/system/helpers.bash +++ b/test/system/helpers.bash @@ -379,6 +379,10 @@ function is_netavark() { return 1 } +function is_aarch64() { + [ "$(uname -m)" == "aarch64" ] +} + # Returns the OCI runtime *basename* (typically crun or runc). Much as we'd # love to cache this result, we probably shouldn't. function podman_runtime() { @@ -546,6 +550,12 @@ function skip_if_root_ubuntu { fi } +function skip_if_aarch64 { + if is_aarch64; then + skip "${msg:-Cannot run this test on aarch64 systems}" + fi +} + ######### # die # Abort with helpful message ######### |