From 3561008c7eac09f00fcf52e716d33e7bc82bb508 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Mon, 4 Dec 2023 11:53:43 -0600 Subject: [PATCH] [stable-2.15] Install upgraded crun from edge (#81833). (#82343) (cherry picked from commit e78cc1e60244fb6cb26ccbdd510b63e20fbf3297) --- test/integration/targets/ansible-test-container/runme.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/test/integration/targets/ansible-test-container/runme.py b/test/integration/targets/ansible-test-container/runme.py index 687128056f7..0cad5108d20 100755 --- a/test/integration/targets/ansible-test-container/runme.py +++ b/test/integration/targets/ansible-test-container/runme.py @@ -1050,9 +1050,16 @@ class ApkBootstrapper(Bootstrapper): def run(cls) -> None: """Run the bootstrapper.""" # The `openssl` package is used to generate hashed passwords. - packages = ['docker', 'podman', 'openssl'] + # crun added as podman won't install it as dep if runc is present + # but we don't want runc as it fails + # The edge `crun` package installed below requires ip6tables, and in + # edge, the `iptables` package includes `ip6tables`, but in 3.17 they + # are separate. + packages = ['docker', 'podman', 'openssl', 'crun', 'ip6tables'] run_command('apk', 'add', *packages) + # 3.17 only contains crun 1.7.2, to get at least 1.9.2 to resolve the run/shm issue, install crun from edge + run_command('apk', 'upgrade', '-U', '--repository=http://dl-cdn.alpinelinux.org/alpine/edge/community', 'crun') run_command('service', 'docker', 'start') run_command('modprobe', 'tun')