From 5008c56c5078a8b5b68d5cfef6f13fb5b0ebda94 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Mon, 2 Oct 2023 13:58:19 -0500 Subject: [PATCH] [stable-2.16] Install upgraded crun from edge (#81833) (#81839) (cherry picked from commit e78cc1e) --- test/integration/targets/ansible-test-container/runme.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/test/integration/targets/ansible-test-container/runme.py b/test/integration/targets/ansible-test-container/runme.py index 55c9b7dcccd..a99004a0987 100755 --- a/test/integration/targets/ansible-test-container/runme.py +++ b/test/integration/targets/ansible-test-container/runme.py @@ -1052,9 +1052,15 @@ class ApkBootstrapper(Bootstrapper): # The `openssl` package is used to generate hashed passwords. # crun added as podman won't install it as dep if runc is present # but we don't want runc as it fails - packages = ['docker', 'podman', 'openssl', 'crun'] + # The edge `crun` package installed below requires ip6tables, and in + # edge, the `iptables` package includes `ip6tables`, but in 3.18 they + # are separate. Remove `ip6tables` once we update to 3.19. + packages = ['docker', 'podman', 'openssl', 'crun', 'ip6tables'] run_command('apk', 'add', *packages) + # 3.18 only contains crun 1.8.4, to get 1.9.2 to resolve the run/shm issue, install crun from edge + # Remove once we update to 3.19 + run_command('apk', 'upgrade', '-U', '--repository=http://dl-cdn.alpinelinux.org/alpine/edge/community', 'crun') run_command('service', 'docker', 'start') run_command('modprobe', 'tun')