From eb73cc488bd38e02ca5a415374277e4971e75ac0 Mon Sep 17 00:00:00 2001 From: Matt Martz Date: Wed, 13 Mar 2024 14:01:01 -0500 Subject: [PATCH] [stable-2.16] Install crun from Alpine 3.19 for known musl compatibility (#82812) (#82814) (cherry picked from commit 86f48a5) --- test/integration/targets/ansible-test-container/runme.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/integration/targets/ansible-test-container/runme.py b/test/integration/targets/ansible-test-container/runme.py index 8603bcded8b..3c86b6dd07c 100755 --- a/test/integration/targets/ansible-test-container/runme.py +++ b/test/integration/targets/ansible-test-container/runme.py @@ -1058,9 +1058,9 @@ class ApkBootstrapper(Bootstrapper): 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 + # 3.18 only contains crun 1.8.4, to get 1.9.2 to resolve the run/shm issue, install crun from 3.19 # Remove once we update to 3.19 - run_command('apk', 'upgrade', '-U', '--repository=http://dl-cdn.alpinelinux.org/alpine/edge/community', 'crun') + run_command('apk', 'upgrade', '-U', '--repository=http://dl-cdn.alpinelinux.org/alpine/v3.19/community', 'crun') run_command('service', 'docker', 'start') run_command('modprobe', 'tun')